Remove a condition that is always true from btree.c. (CVS 6798)

FossilOrigin-Name: 3ec8b37a89fdb2436d312439715414fae2cd20a8

diff --git a/manifest b/manifest
index 71c78f492ee4d01ba6b75722526b7f374fa198f2..54380829bfcce498bf57ac10863a33cf4bf989b9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\ssqlite3BtreeCreateTable()\sreturns\san\serror\scode\sif\sthe\slargest\nrootpage\sfield\sis\sinvalid\sin\sauto_vacuum\smode.\s\sUpdate\sfile-format\scomments\nto\sdescribe\sall\sof\sthe\s"meta"\svalues.\s(CVS\s6797)
-D 2009-06-22T12:05:10
+C Remove\sa\scondition\sthat\sis\salways\strue\sfrom\sbtree.c.\s(CVS\s6798)
+D 2009-06-22T18:03:52
 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 e24cdcd3280a63ce06b169a9467f554db325257d
+F src/btree.c 4796c27b387cd027d8f65f73132bba977829af64
 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323
 F src/btreeInt.h 7267e965e34314aa2bddbdde268b31e1034eda9c
 F src/build.c e98868af6a04c8d7191c39fd05c69da34a8d9c68
@@ -736,7 +736,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P c8f009bd24cb4e4b5ce9fbfd8ab09921f19d41af
-R f45ee7668e1d79012c0ac1e6854fd45f
-U drh
-Z 1115270f9ad30d3543333759055c6623
+P bda38f5e86db45234c2dbb0f8d1a81f6ff6d04e4
+R e49401abe650f38b382c2f4526e14814
+U danielk1977
+Z d013caf2ebacc662cceed0c56ce2e6b5

diff --git a/manifest.uuid b/manifest.uuid
index 2ffa4086b0761dc420b94bc5fb1f7d8e3183bac0..4be5ea34e1eaf615353a386cde43a232fc4b6652 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bda38f5e86db45234c2dbb0f8d1a81f6ff6d04e4
\ No newline at end of file
+3ec8b37a89fdb2436d312439715414fae2cd20a8
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 5b18a46772155fea0ad9710acb8b9ef3b1dd1e7a..9d4592386023cda2e8bf261094249b5accd5b06a 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.637 2009/06/22 12:05:10 drh Exp $
+** $Id: btree.c,v 1.638 2009/06/22 18:03:52 danielk1977 Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -6401,6 +6401,7 @@ int sqlite3BtreeInsert(
   )){
     return rc;
   }
+  assert( pCur->eState==CURSOR_VALID || (pCur->eState==CURSOR_INVALID && loc) );
 
   pPage = pCur->apPage[pCur->iPage];
   assert( pPage->intKey || nKey>=0 );
@@ -6417,7 +6418,7 @@ int sqlite3BtreeInsert(
   assert( szNew==cellSizePtr(pPage, newCell) );
   assert( szNew<=MX_CELL_SIZE(pBt) );
   idx = pCur->aiIdx[pCur->iPage];
-  if( loc==0 && CURSOR_VALID==pCur->eState ){
+  if( loc==0 ){
     u16 szOld;
     assert( idx<pPage->nCell );
     rc = sqlite3PagerWrite(pPage->pDbPage);