Fix an incorrect assert in btree.c. (CVS 6465)

FossilOrigin-Name: 2c1f59834ab7a16066ee12cb8a8342d438c23ce9

diff --git a/manifest b/manifest
index 68ec2cbbf21f2bba0553c7499116af2fd22a7dcd..fa5584edf84793b39e39f3867db213b584dd7756 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompilation\sand\stesting\swhen\sSQLITE_OMIT_TRIGGER\sis\sdefined.\sTicket\s#3786.\s(CVS\s6464)
-D 2009-04-07T14:14:22
+C Fix\san\sincorrect\sassert\sin\sbtree.c.\s(CVS\s6465)
+D 2009-04-07T14:38:58
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -103,7 +103,7 @@ F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d
 F src/bitvec.c ef370407e03440b0852d05024fb016b14a471d3d
 F src/btmutex.c 341502bc496dc0840dcb00cde65680fb0e85c3ab
-F src/btree.c effd3b709121baae988cb3762894bfb047f3d4e5
+F src/btree.c 0d02176d76c6e202cff0788929e8eee71bf60e88
 F src/btree.h 8007018c1753944790c39610280894ab280210b8
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
 F src/build.c 72357fd75ef036d0afbf1756edab6d62c56fcf4b
@@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 55b93649258204797f56a58322cf31b564469633
-R 4fa93a7b88ebb3ef1e8c16f682b0f343
+P 277dace43d51fbc79c7a62fc841c150ecd8d0823
+R 74483128416315113cbacecd6bfd9ec0
 U danielk1977
-Z 3aac3520d9a453008b701269679795d2
+Z 02ca545045d4e1ee61fb3747cb34d011

diff --git a/manifest.uuid b/manifest.uuid
index 96c4dff2d56210c2c1088f52834c39269bcebd55..b9e0532259f27376c5b2a1e304ae4c709b42c416 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-277dace43d51fbc79c7a62fc841c150ecd8d0823
\ No newline at end of file
+2c1f59834ab7a16066ee12cb8a8342d438c23ce9
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 10fcd835f920089f75b9adc3abeec16e4a0c3f4a..57732c04f5e3f36367154745672106e475d399c1 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.591 2009/04/06 17:50:03 danielk1977 Exp $
+** $Id: btree.c,v 1.592 2009/04/07 14:38:58 danielk1977 Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -6351,8 +6351,8 @@ int sqlite3BtreeDelete(BtCursor *pCur){
           rc = sqlite3BtreeNext(&leafCur, &notUsed);
         }
         pLeafPage = leafCur.apPage[leafCur.iPage];
-        assert( pLeafPage->pgno==leafPgno );
-        assert( leafCur.aiIdx[leafCur.iPage]==0 );
+        assert( rc!=SQLITE_OK || pLeafPage->pgno==leafPgno );
+        assert( rc!=SQLITE_OK || leafCur.aiIdx[leafCur.iPage]==0 );
       }
 
       if( SQLITE_OK==rc