Remove an assert() in btree.c which is no longer true due to changes in

the error reporting behavior of ptrmapPut(). (CVS 6914)

FossilOrigin-Name: 110998f18a7ad1ddaffab048cabef675d882cbb8

diff --git a/manifest b/manifest
index 9d5e459a757993ecde4971c7152d8f083073967f..15b41845c1909d11c51f099409d94d53be9704ca 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sbtree.c\sin\ssupport\sof\scoverage\stesting.\s(CVS\s6913)
-D 2009-07-21T11:52:35
+C Remove\san\sassert()\sin\sbtree.c\swhich\sis\sno\slonger\strue\sdue\sto\schanges\sin\nthe\serror\sreporting\sbehavior\sof\sptrmapPut().\s(CVS\s6914)
+D 2009-07-21T15:33:14
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,7 +106,7 @@ F src/auth.c 802a9439dfa0b8c208b10055cba400e82ef18025
 F src/backup.c 6f1c2d9862c8a3feb7739dfcca02c1f5352e37f3
 F src/bitvec.c cfbf6af5b0ababb4f06ed3e75c616dadaf47fcbd
 F src/btmutex.c 0f43a75bb5b8147b386e8e1c3e71ba734e3863b7
-F src/btree.c d5dde31b5743d90cee35071f4828ff38bdf90199
+F src/btree.c d5f5b30e99c76313be8c536ddfe23ef8f977dce1
 F src/btree.h e53a10fd31d16c60a86f03c9467a6f470aa3683b
 F src/btreeInt.h 1c86297e69380f6577e7ae67452597dd8d5c2705
 F src/build.c 867028ee9f63f7bc8eb8d4a720bb98cf9b9a12b4
@@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P a159e9d24708dfe6c5a98d220e39f3b1b2a3d281
-R 1cd0f279a79b2344821cde6c251ba1a6
+P 4cf23e9e860bd6245344884ec84f487fdf36f86f
+R 4d981fb2e48132ca3248308bdb7b71d3
 U drh
-Z b3b11d19f04a316773edec9a04d19c25
+Z 96adb5cc46ca1f3f04bd2c13acf12fa5

diff --git a/manifest.uuid b/manifest.uuid
index f252768ab5bc695960bfaea8c346ed0a3e155e72..f81713432203983496b34917e2460fa976ddd7a3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cf23e9e860bd6245344884ec84f487fdf36f86f
\ No newline at end of file
+110998f18a7ad1ddaffab048cabef675d882cbb8
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index f0161a0eb3c6c6d92f8d4daff0a3bab6784ee2fa..857fc6a9f0870d669b494a4a8cf657fd1192948f 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.694 2009/07/21 11:52:35 drh Exp $
+** $Id: btree.c,v 1.695 2009/07/21 15:33:14 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -6160,7 +6160,6 @@ static int balance_nonroot(
         pNew = apNew[++k];
         if( !leafData ) continue;
       }
-      assert( rc==SQLITE_OK );
       assert( j<nOld );
       assert( k<nNew );