aboutsummaryrefslogtreecommitdiff
path: root/src/pager.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2008-07-07 19:52:09 +0000
committerdrh <drh@noemail.net>2008-07-07 19:52:09 +0000
commitbd0b1b50f4bb78d79c25bb471ec2b8ed35a4debe (patch)
treefbe22f280a5dff4e40969ea98f73508844d80b99 /src/pager.c
parentda8c8f2f8f9b44f18109f985a166e7ee3727f103 (diff)
downloadsqlite-bd0b1b50f4bb78d79c25bb471ec2b8ed35a4debe.tar.gz
sqlite-bd0b1b50f4bb78d79c25bb471ec2b8ed35a4debe.zip
Make check-in (5356) compatible with builds that do not enable memory
management. Remove unnecessary code from main.c. Add out-of-memory tests for sqlite3_complete16(). (CVS 5357) FossilOrigin-Name: 28f8b6bfcc3e169f8a54a6681395f2c85bf99cab
Diffstat (limited to 'src/pager.c')
-rw-r--r--src/pager.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pager.c b/src/pager.c
index 755e279f1..85be7baa5 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
-** @(#) $Id: pager.c,v 1.462 2008/07/07 18:42:41 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.463 2008/07/07 19:52:10 drh Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -2651,9 +2651,11 @@ static void pager_truncate_cache(Pager *pPager){
ppPg = &pPg->pNextAll;
}else{
*ppPg = pPg->pNextAll;
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
if( *ppPg ){
(*ppPg)->pPrevAll = pPg->pPrevAll;
}
+#endif
IOTRACE(("PGFREE %p %d\n", pPager, pPg->pgno));
PAGER_INCR(sqlite3_pager_pgfree_count);
unlinkPage(pPg);