Remove a NEVER from balance_quick() that can occur in WAL mode on

a corrupt database file.

FossilOrigin-Name: b273891ab05a18b68a76c870ea3be9f1a56c40a9

diff --git a/manifest b/manifest
index c74c91a2ae17a9c3ac2c87e9c0b0ab764baf5fdb..7df1e71185029ac352783e5ddcc2777d6c34b8ef 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\stwo\sasserts\sin\sthe\sbtree\slogic\sso\sthat\sthey\swork\scorrectly\seven\sfor\nmaximum-size\sindex\sentries\sfor\s32K\sand\s64K\spages.
-D 2010-08-18T21:19:04
+C Remove\sa\sNEVER\sfrom\sbalance_quick()\sthat\scan\soccur\sin\sWAL\smode\son\na\scorrupt\sdatabase\sfile.
+D 2010-08-19T14:22:43
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -116,7 +116,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 51d83300fe0baee39405c416ceb19a58ed30a8ed
 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
-F src/btree.c 3089d018fd27082952d79543e771f6bc8af0b0f7
+F src/btree.c 69942b33b4ed4e0cc9a36b18a288839293528267
 F src/btree.h b4ba2fdf6b64c7c376bdfffa826af6b786b151d9
 F src/btreeInt.h 5b034ff54800046cc5870605d683ac1f9134bd99
 F src/build.c 0018d49629fc4807100c988dd191dd95e185bb38
@@ -847,14 +847,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P d46567e5d75a2b9fe96d2a7a30708b2827a0d490
-R d8d679ffa4745c8bf93b5e6b5825b960
+P e127192d106bd7e036caacf01bf7725eeaa85dbe
+R 632e7d1a1a62c66b217f6e428da8c948
 U drh
-Z 7f378ed449a1354042bf47ceab852b72
+Z 38042f7a90e879974916eb9824aa2544
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMbE5MoxKgR168RlERAm3gAJ9j3QLeVFJiXfvfSnsTlMhGqmvBSgCfTW3m
-v1U06YCPq+T+CyTYAg08zFE=
-=0zqd
+iD8DBQFMbT42oxKgR168RlERAjfWAJ9X2TT9Jgt+gOAGVCXTDk2lhaURTgCfd232
+JRi5G2mkJgNJEIZx8qN+L00=
+=sc1U
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index d18da8b5e80da0dc9674f28ff9cc39b73cd9f548..a5243a7533e9726685b2492d6a1179d79b0962c2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e127192d106bd7e036caacf01bf7725eeaa85dbe
\ No newline at end of file
+b273891ab05a18b68a76c870ea3be9f1a56c40a9
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 7a41057120776528b92f6f70842750205454689e..f6110a9110d8be6c46ef9201911791146b423c1b 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -5560,7 +5560,7 @@ static int balance_quick(MemPage *pParent, MemPage *pPage, u8 *pSpace){
   assert( pPage->nOverflow==1 );
 
   /* This error condition is now caught prior to reaching this function */
-  if( NEVER(pPage->nCell<=0) ) return SQLITE_CORRUPT_BKPT;
+  if( pPage->nCell<=0 ) return SQLITE_CORRUPT_BKPT;
 
   /* Allocate a new page. This page will become the right-sibling of 
   ** pPage. Make the parent page writable, so that the new divider cell