Revert part of (6860) that was accidentally checked in. (CVS 6864)

FossilOrigin-Name: 11e295ccd28fe669ee74c846db507040895a5e5b

diff --git a/manifest b/manifest
index 2d7b97dbe2e56fc4cba81cfabdb3cdae67d2f67a..cb1eae500519d978ced85418d6b7c9665cd2e8e3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sanother\sboundary-condition\stestcase()\smacro\sto\sbtree.c.\s\sCorrect\sthe\ncomment\son\smodifyPagePointer().\s(CVS\s6863)
-D 2009-07-08T18:12:49
+C Revert\spart\sof\s(6860)\sthat\swas\saccidentally\schecked\sin.\s(CVS\s6864)
+D 2009-07-08T18:45:38
 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 0ef0651714728055d43de7a4cdd95e703fac0119
 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
-F src/btree.c a2117e0dde3eeb5845b3a6f56bfed2255e3eefdb
+F src/btree.c 8a607b18c4f2ef57dce95acbba33cd02963608a7
 F src/btree.h e761619e76a1125d2d82bd3613b5a7ac7d1ee6f7
 F src/btreeInt.h b31e5ac04181c7e2892c33ab06228c551df6233c
 F src/build.c 867028ee9f63f7bc8eb8d4a720bb98cf9b9a12b4
@@ -740,7 +740,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 5ac991b3cea214095b8369e85f3e0ad8e5059ad6
-R ca47272c465be8241f9f27fe855a504a
-U drh
-Z b7a8ccb171b7c92d55cc6ecbc4d9687d
+P fed66e8695ee552d5ca05ac91485cfc5940e7496
+R 970ff541d3b00c7cfdc8aaddef1c5059
+U danielk1977
+Z 467fb297c57bf2d40a838e95d3ea7d92

diff --git a/manifest.uuid b/manifest.uuid
index 5446f645673a92ec26a379879af236caebf766a6..5deb751de236802e318286e7a1764fa31267e57f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fed66e8695ee552d5ca05ac91485cfc5940e7496
\ No newline at end of file
+11e295ccd28fe669ee74c846db507040895a5e5b
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index cad5fa58f8752a424459235523a0fc8799bceaa6..04cee31c474790a36fa92e0a4d209668753b336c 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.663 2009/07/08 18:12:49 drh Exp $
+** $Id: btree.c,v 1.664 2009/07/08 18:45:38 danielk1977 Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -7750,7 +7750,9 @@ int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){
   **   (d) there are no conflicting read-locks, and
   **   (e) the cursor points at a valid row of an intKey table.
   */
-  assert( pCsr->wrFlag );
+  if( !pCsr->wrFlag ){
+    return SQLITE_READONLY;
+  }
   assert( !pCsr->pBt->readOnly && pCsr->pBt->inTransaction==TRANS_WRITE );
   assert( hasSharedCacheTableLock(pCsr->pBtree, pCsr->pgnoRoot, 0, 2) );
   assert( !hasReadConflicts(pCsr->pBtree, pCsr->pgnoRoot) );