From: drh <drh@noemail.net>
Date: Wed, 17 Oct 2012 13:15:02 +0000 (+0000)
Subject: Remove an incorrect "#ifndef SQLITE_OMIT_AUTOVACUUM" from pager.
X-Git-Tag: version-3.7.15~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0a23e5c9c07e9b1d96fb8b454c077fd54cd1ed0;p=thirdparty%2Fsqlite.git

Remove an incorrect "#ifndef SQLITE_OMIT_AUTOVACUUM" from pager.

FossilOrigin-Name: bf44d73d3e4ec403947d361d2fa150cc240c4d45
---

diff --git a/manifest b/manifest
index be0f0a1ebc..b49c331c10 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\scomments\sand\senhance\sreadability\sof\sthe\smkvsix\stool.
-D 2012-10-15T20:28:22.029
+C Remove\san\sincorrect\s"#ifndef\sSQLITE_OMIT_AUTOVACUUM"\sfrom\spager.
+D 2012-10-17T13:15:02.029
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 0d3a39dd576c9f384fd7772a2dadc67b144c6ce7
 F src/os_win.c 28bd027791252a4012dffd4d64355a1eb84d761c
-F src/pager.c 36642c0955c19840b5445e7e9da7b5b0d8235346
+F src/pager.c ee59fef31673d5124413c5a801cfd9ef3e6766d3
 F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -1021,7 +1021,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 629a42d47a0d8f73de900f469845ce800bdb8959
-R c7830c7c0cb344c8cb6a175c95e5eb7f
-U mistachkin
-Z f2086ddd83e8b281e8d53ba90c91d2db
+P 2c3af657fee6153842d660a6ce29aa7d791ebd38
+R d55cc10c39c57d8a9dc0166111e15a7c
+U drh
+Z 4c6ce6c173b785cd15d66fe798355adb
diff --git a/manifest.uuid b/manifest.uuid
index 915ba49368..8b9d309d8c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2c3af657fee6153842d660a6ce29aa7d791ebd38
\ No newline at end of file
+bf44d73d3e4ec403947d361d2fa150cc240c4d45
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index cec0c8ff8e..a96dc45b82 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -5885,7 +5885,7 @@ int sqlite3PagerCommitPhaseOne(
   
       /* If this transaction has made the database smaller, then all pages
       ** being discarded by the truncation must be written to the journal
-      ** file. This can only happen in auto-vacuum mode.
+      ** file.
       **
       ** Before reading the pages with page numbers larger than the 
       ** current value of Pager.dbSize, set dbSize back to the value
@@ -5893,7 +5893,6 @@ int sqlite3PagerCommitPhaseOne(
       ** calls to sqlite3PagerGet() return zeroed pages instead of 
       ** reading data from the database file.
       */
-  #ifndef SQLITE_OMIT_AUTOVACUUM
       if( pPager->dbSize<pPager->dbOrigSize 
        && pPager->journalMode!=PAGER_JOURNALMODE_OFF
       ){
@@ -5913,7 +5912,6 @@ int sqlite3PagerCommitPhaseOne(
         }
         pPager->dbSize = dbSize;
       } 
-  #endif
   
       /* Write the master journal name into the journal file. If a master 
       ** journal file name has already been written to the journal file,