diff options
| -rw-r--r-- | manifest | 24 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/pager.c | 4 |
3 files changed, 8 insertions, 22 deletions
@@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -C Reinstate\sthe\s"sqlite"\salias\sfor\sbackwards\scompatibility\s(but\sleave\s\nit\sundocumented)\sbut\sremove\sthe\sPackageProvide\sfor\s"sqlite". -D 2010-08-25T20:35:51 +C Simplification\sof\schanges\sfor\sSQLITE_OMIT_WAL\ssupport\sin\spager.c. +D 2010-08-26T05:23:37 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -160,7 +157,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e F src/os_unix.c 11194cbcf6a57456e58022dc537ab8c3497d9bb9 F src/os_win.c 718a48ca09d1bb747acb6b76e6a7e20eab182a7e -F src/pager.c 48556db031d16064ffbde48053da8ec5032df7e8 +F src/pager.c 59ded919eed6e2f1e89bfcfcfdaa55b159450d7b F src/pager.h ef8c8f71ab022cc2fff768a1175dd32355be9dcd F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07 @@ -850,14 +847,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 909b3d8862aeae04611969f5fc27d32a82026767 -R 764c99689ee6b1ab3c95ea5643a88612 -U drh -Z a4a2c827e86e7f9928530c9b4e6b2fe5 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFMdX6qoxKgR168RlERAsEhAJwMKGZqB9weJp14pkFqFVNZtWL0ZgCfchua -+QBIgEpturnqd6DIbr4qhkI= -=Ru8a ------END PGP SIGNATURE----- +P 699cc6b48774be111f2e076cc1920ae79497dcea +R dbf929a2ab5b426ab9068f733752d8aa +U shaneh +Z 81bf9be826701101829ac75722805b4a diff --git a/manifest.uuid b/manifest.uuid index 1c1677f7e..fcb87c39b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -699cc6b48774be111f2e076cc1920ae79497dcea
\ No newline at end of file +afb2484c64bf0cdec8240b9ecd0a794c44a63066
\ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 60407b9f7..f6b9e6b77 100644 --- a/src/pager.c +++ b/src/pager.c @@ -2999,11 +2999,7 @@ static int pagerPagecount(Pager *pPager, Pgno *pnPage){ */ assert( pPager->eState==PAGER_OPEN ); assert( pPager->eLock>=SHARED_LOCK || pPager->noReadlock ); -#ifndef SQLITE_OMIT_WAL nPage = sqlite3WalDbsize(pPager->pWal); -#else - nPage = 0; -#endif /* If the database size was not available from the WAL sub-system, ** determine it based on the size of the database file. If the size |