Fix an assert() in btree.c that is only true for non-corrupt databases.

FossilOrigin-Name: 29f7227ff127202c53fe7c3b6558b3c101b0a7bc

diff --git a/manifest b/manifest
index bc26811e331545ed9a7e6141536a4c75b1b9a488..9f3656c5ac012a6c91693a65b563411210e7666a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clear\sthe\sBTCF_ValidNKey\sflag\swhen\sputting\sa\scursor\sinto\sREQUIRESEEK\sstate.\sFix\sfor\s[1b266395].
-D 2015-09-30T12:59:12.171
+C Fix\san\sassert()\sin\sbtree.c\sthat\sis\sonly\strue\sfor\snon-corrupt\sdatabases.
+D 2015-09-30T14:19:08.486
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2143eeef6d0cc26006ae5fc4bb242a4a8b973412
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -282,7 +282,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
 F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c dd877a85fc968c5f069d0cd133c6b420ec3112fa
+F src/btree.c a5a653087ae98dd743d12ae0920d5b64c5335960
 F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
 F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 F src/build.c 0549b56722f15c146ca21f82a33838365c2031f0
@@ -1389,7 +1389,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 31a91ee7d32af8580a170903eb857ed9222fdb0a
-R 4a74a22a0c922f420238bb3d30a78646
-U dan
-Z 36f983bdf307cdff5171dc6e84fb5a56
+P a6d5e4e8693bea3739c35fe9769ac9abfb9ed056
+R d123bfb9b25dcb8cf6d4214c017e0514
+U drh
+Z b7257b8e8fb8545cc0082886f7c4483e

diff --git a/manifest.uuid b/manifest.uuid
index fafa0fcdff91bac5fd480be27c6b36e031543a15..d0ec470927d9c5ad22de1cd085d0ac2e067ae204 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a6d5e4e8693bea3739c35fe9769ac9abfb9ed056
\ No newline at end of file
+29f7227ff127202c53fe7c3b6558b3c101b0a7bc
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index bf777aa96916e88e33ff07d6ab0c54906e2c671d..1eae0ac5d2b233ee9d694a7482f2ce0af9fdcc00 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -7624,7 +7624,7 @@ static int balance_nonroot(
     ** by smaller than the child due to the database header, and so all the
     ** free space needs to be up front.
     */
-    assert( nNew==1 );
+    assert( nNew==1 || CORRUPT_DB );
     rc = defragmentPage(apNew[0]);
     testcase( rc!=SQLITE_OK );
     assert( apNew[0]->nFree ==