database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Remove an incorrect "#ifndef SQLITE_OMIT_AUTOVACUUM" from pager.

Browse Source 
FossilOrigin-Name: bf44d73d3e4ec403947d361d2fa150cc240c4d45
This commit is contained in:
drh
2012-10-17 13:15:02 +00:00
parent 21890127cd
commit c0a23e5c9c
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Correct\scomments\sand\senhance\sreadability\sof\sthe\smkvsix\stool. C Remove\san\sincorrect\s"#ifndef\sSQLITE_OMIT_AUTOVACUUM"\sfrom\spager.
D 2012-10-15T20:28:22.029 D 2012-10-17T13:15:02.029
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_unix.c 0d3a39dd576c9f384fd7772a2dadc67b144c6ce7 F src/os_unix.c 0d3a39dd576c9f384fd7772a2dadc67b144c6ce7
F src/os_win.c 28bd027791252a4012dffd4d64355a1eb84d761c F src/os_win.c 28bd027791252a4012dffd4d64355a1eb84d761c
F src/pager.c 36642c0955c19840b5445e7e9da7b5b0d8235346 F src/pager.c ee59fef31673d5124413c5a801cfd9ef3e6766d3
F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0 F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0
F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -1021,7 +1021,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
P 629a42d47a0d8f73de900f469845ce800bdb8959 P 2c3af657fee6153842d660a6ce29aa7d791ebd38
R c7830c7c0cb344c8cb6a175c95e5eb7f R d55cc10c39c57d8a9dc0166111e15a7c
U mistachkin U drh
Z f2086ddd83e8b281e8d53ba90c91d2db Z 4c6ce6c173b785cd15d66fe798355adb

2
manifest.uuid
View File

@@ -1 +1 @@
2c3af657fee6153842d660a6ce29aa7d791ebd38 bf44d73d3e4ec403947d361d2fa150cc240c4d45

4
src/pager.c
View File

@@ -5885,7 +5885,7 @@ int sqlite3PagerCommitPhaseOne(
/* If this transaction has made the database smaller, then all pages /* If this transaction has made the database smaller, then all pages
** being discarded by the truncation must be written to the journal ** 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 ** Before reading the pages with page numbers larger than the
** current value of Pager.dbSize, set dbSize back to the value ** 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 ** calls to sqlite3PagerGet() return zeroed pages instead of
** reading data from the database file. ** reading data from the database file.
*/ */
#ifndef SQLITE_OMIT_AUTOVACUUM
if( pPager->dbSize<pPager->dbOrigSize if( pPager->dbSize<pPager->dbOrigSize
&& pPager->journalMode!=PAGER_JOURNALMODE_OFF && pPager->journalMode!=PAGER_JOURNALMODE_OFF
){ ){
@@ -5913,7 +5912,6 @@ int sqlite3PagerCommitPhaseOne(
} }
pPager->dbSize = dbSize; pPager->dbSize = dbSize;
} }
#endif
/* Write the master journal name into the journal file. If a master /* Write the master journal name into the journal file. If a master
** journal file name has already been written to the journal file, ** journal file name has already been written to the journal file,