From e1df4e31ec386c7c00dc913926e01b312a592203 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 5 Mar 2013 11:27:04 +0000 Subject: [PATCH] Fix a bug in the recent incremental-vacuum related changes. FossilOrigin-Name: 717863fca6d58828bf9321bc8b169e385ad4263f --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 29d706ef83..871ea51352 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Simplified\serror\smessage\son\sthe\sshowdb\sutility. -D 2013-03-05T01:46:26.107 +C Fix\sa\sbug\sin\sthe\srecent\sincremental-vacuum\srelated\schanges. +D 2013-03-05T11:27:04.053 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/backup.c b2cac9f7993f3f9588827b824b1501d0c820fa68 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c ea4cc870674e608cd9349798d6f7811feeb85643 +F src/btree.c c7ce6045f023ba6426d5cca63fab5e1e3d282309 F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2 F src/build.c 375e5df716e03b9343c5e1211be3b24e6d6dff05 @@ -1036,7 +1036,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P f40552ada57622825d2974d392356aa34612d5ee -R e74a37a3f1e9384492860c906eed95aa -U drh -Z b5a881064edd7a6340015d7ebf25b267 +P 8e0ced1af78d8c25a06423a8e7e337ac845155cc +R d0fc02cfce5e41e4c1a5be120b4b33d4 +U dan +Z c4b64c03342d1e7d5813b1d9185813bd diff --git a/manifest.uuid b/manifest.uuid index 99c68ef8c9..95a5e3503e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8e0ced1af78d8c25a06423a8e7e337ac845155cc \ No newline at end of file +717863fca6d58828bf9321bc8b169e385ad4263f \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 24211a5289..16b56f5bf0 100644 --- a/src/btree.c +++ b/src/btree.c @@ -3004,7 +3004,7 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin, Pgno iLastPg, int bCommit){ }while( bCommit && iFreePg>nFin ); assert( iFreePg