From: drh <drh@noemail.net>
Date: Tue, 14 May 2013 23:13:41 +0000 (+0000)
Subject: Merge together the fork in this branch.
X-Git-Tag: version-3.7.17~17^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35cbe7f5234382595eb10b4e70df20d42589eef6;p=thirdparty%2Fsqlite.git

Merge together the fork in this branch.

FossilOrigin-Name: 164e3d4da20cc16d2a04d602b5a8229e0db99d9d
---

35cbe7f5234382595eb10b4e70df20d42589eef6
diff --cc manifest
index 52879ddaa4,0764d64e6e..86930fe5cb
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\sdeleting\sa\sb-tree\s"has-content"\svector\sbelonging\sto\sanother\sshared-cache\sconnection\sfrom\swithin\ssqlite3_close().
- D 2013-05-14T20:36:31.591
 -C Fix\san\sassert()\sin\sunlockBtreeIfUnused()\sso\sthat\sit\schecks\sfor\sthe\sexistance\nof\san\suntripped\scursor,\snot\sfor\sthe\sexistance\sof\sany\scursor\sat\sall.
 -D 2013-05-14T23:12:06.185
++C Merge\stogether\sthe\sfork\sin\sthis\sbranch.
++D 2013-05-14T23:13:41.194
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -137,7 -137,7 +137,7 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c b266767351ae2d847716c56fcb2a1fea7c761c03
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c e42631ac1fe6d0d3a0a5e36330b203f69052be21
 -F src/btree.c 34ea83e16ece6d666214c7d0c3a39ce92fe292fd
++F src/btree.c fcfbe61a311e54224b23527bbf7586ce320e7b40
  F src/btree.h 6fa8a3ff2483d0bb64a9f0105a8cedeac9e00cca
  F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
  F src/build.c 083da8466fd7e481cb8bd5264398f537507f6176
@@@ -1063,7 -1063,7 +1063,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
--P ea0428f9b6e63066e7444a2ba2f8c12a2e3ab7e4
- R f68931e6fbc759d31073a5961092df76
- U dan
- Z c980c1bd80d8d5755c03b6b85fccf1ca
 -R 2410ec7fd380116c79746c720dac4cd6
++P 93462df78247f5634b9f53752cf80056bbfe9aac a6f851d0fe01d8c8d44a2fe0b716ff7a5194c63b
++R fd9716795d11f0f9b0e245778ae3dfdf
+ U drh
 -Z 5ded41815869fd9a599b4926f7c8b138
++Z 207682ad3d629f4d5a07b6ee61017db7
diff --cc manifest.uuid
index b122e3091d,fc052d359f..6b647583c4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 93462df78247f5634b9f53752cf80056bbfe9aac
 -a6f851d0fe01d8c8d44a2fe0b716ff7a5194c63b
++164e3d4da20cc16d2a04d602b5a8229e0db99d9d
diff --cc src/btree.c
index d0441790fc,297b0a7f8e..3ca60583e3
--- a/src/btree.c
+++ b/src/btree.c
@@@ -3451,9 -3453,8 +3453,9 @@@ int sqlite3BtreeRollback(Btree *p, int 
        pBt->nPage = nPage;
        releasePage(pPage1);
      }
-     assert( countWriteCursors(pBt)==0 );
+     assert( countValidCursors(pBt, 1)==0 );
      pBt->inTransaction = TRANS_READ;
 +    btreeClearHasContent(pBt);
    }
  
    btreeEndTransaction(p);