Remove a corruption test in balance_nonroot that is superceded by a prior

better check.

FossilOrigin-Name: 00693682d8664fa608ba43684f6376a9bd5b84eb

diff --git a/manifest b/manifest
index 6d5d03c1b325569ed430cdb39a0f575528d25f91..6fc68cc1585b059ae69bae245e83a9e92c20b065 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\srowallock.test\sscript\s(Read-Only\sWAL\slock)\sfrom\sthe\s\ninmemory_journal\spermutation.
-D 2015-05-29T15:15:40.911
+C Remove\sa\scorruption\stest\sin\sbalance_nonroot\sthat\sis\ssuperceded\sby\sa\sprior\nbetter\scheck.
+D 2015-05-29T17:13:14.348
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 994bab32a3a69e0c35bd148b65cde49879772964
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -192,7 +192,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
 F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c a1f510492027253e016d347d78d3c94ea0376595
+F src/btree.c 7dcddf0ae24076ba6ee3cda393c6211a5c6a2477
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
 F src/build.c 85a169a0a22f8b80caf513eaf2944d39b979f571
@@ -1281,7 +1281,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 020b8b106fc8f840f6b506e1c9c3bc75676daec3
-R 66158a5898be2753c3b3aab0410cc41d
+P d21db3308996510ffc3c869c2ac093de70d03412
+R 384e50fd9f5eabe1effd940fe34288b1
 U drh
-Z e9a85cbb72f219095603560550fbabe4
+Z 2414e807ca41c4170d36989b6a30d8be

diff --git a/manifest.uuid b/manifest.uuid
index 0c405a3db5fe106b9cfede21e2e873cb75be74a8..8dd846db4d098ff4df7774741c5e58a96a988fa8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d21db3308996510ffc3c869c2ac093de70d03412
\ No newline at end of file
+00693682d8664fa608ba43684f6376a9bd5b84eb
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index ca774708251c35113c9975b2846b800c9bfd67b2..01d6fcbd91d9c1813ba8bce08b9c391b982bb265 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -7027,10 +7027,6 @@ static int balance_nonroot(
   /*
   ** Allocate k new pages.  Reuse old pages where possible.
   */
-  if( apOld[0]->pgno<=1 ){
-    rc = SQLITE_CORRUPT_BKPT;
-    goto balance_cleanup;
-  }
   pageFlags = apOld[0]->aData[0];
   for(i=0; i<k; i++){
     MemPage *pNew;