From cb5579995252a9f12e745f1360c93f1d6355afaf Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Tue, 16 Jun 2009 04:31:49 +0000 Subject: [PATCH] Remove a duplicate assert from btree.c. Ticket #3915. (CVS 6765) FossilOrigin-Name: d89542cd8b2efaea7c6be6cd7787d183c55ae36a --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 3 +-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 3b9bf6dc40..06d8d160a3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Additional\supdates\sto\sthe\ssymbol\sresolver\sand\sexpression\stree\swalker\sto\nfacilitate\stest\scoverage.\s(CVS\s6764) -D 2009-06-15T23:15:59 +C Remove\sa\sduplicate\sassert\sfrom\sbtree.c.\sTicket\s#3915.\s(CVS\s6765) +D 2009-06-16T04:31:49 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -106,7 +106,7 @@ F src/auth.c 98db07c2088455797678eb1031f42d4d94d18a71 F src/backup.c ff50af53184a5fd7bdee4d620b5dabef74717c79 F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c -F src/btree.c 8363cf2ee0276cb6cee74aed3449816e19b1162d +F src/btree.c 081150263715e7a4d42d6fa1c5c246076cf24f58 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5 F src/build.c 6c7b96103cebc558710ae72e2ce99b91c8ccd961 @@ -734,7 +734,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746 -P 1591b8322babebc45df3b799cc5e457288f28594 -R 470d1cef74e62b42973a2d3f18571011 -U drh -Z 9d5cb86b471f22bb23ed8e81d595d871 +P a49c2d4befcc33dd98543fe7b4d4f0bae56f1a90 +R b5b8f2dffb5405936d28de4c29456640 +U danielk1977 +Z 4402157b592d3b96762b57e696bd989d diff --git a/manifest.uuid b/manifest.uuid index 72f0d877b4..ff5cb7d1e9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a49c2d4befcc33dd98543fe7b4d4f0bae56f1a90 \ No newline at end of file +d89542cd8b2efaea7c6be6cd7787d183c55ae36a \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index a171488058..75b1d440c9 100644 --- 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.628 2009/06/15 16:27:08 shane Exp $ +** $Id: btree.c,v 1.629 2009/06/16 04:31:49 danielk1977 Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** See the header comment on "btreeInt.h" for additional information. @@ -6287,7 +6287,6 @@ int sqlite3BtreeInsert( pPage = pCur->apPage[pCur->iPage]; assert( pPage->intKey || nKey>=0 ); - assert( pPage->intKey || nKey>=0 ); assert( pPage->leaf || !pPage->intKey ); TRACE(("INSERT: table=%d nkey=%lld ndata=%d page=%d %s\n", pCur->pgnoRoot, nKey, nData, pPage->pgno,