From: drh <drh@noemail.net>
Date: Wed, 15 May 2013 17:08:46 +0000 (+0000)
Subject: Merge the shared-cache-fixes branch into trunk.
X-Git-Tag: version-3.7.17~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7d2573d7c7d701427899eb80084b1fb634acfb8;p=thirdparty%2Fsqlite.git

Merge the shared-cache-fixes branch into trunk.

FossilOrigin-Name: 5cc1cc55d28a73d390d51fdf6f2c026f1cab1d75
---

f7d2573d7c7d701427899eb80084b1fb634acfb8
diff --cc manifest
index 29f23cf1c6,cda4f88975..a89e78f7e8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Extra\stest\sfor\scommit\s[6dae62c4e5].
- D 2013-05-15T16:24:46.069
 -C Fix\sthe\ssharedA.test\smodule\sso\sthat\sit\sdoes\snot\sattempt\sto\srun\sTCL\scallbacks\non\sa\sdifferent\sthread\sfrom\swhere\sthe\sinterpreter\swas\soriginally\screated.
 -D 2013-05-15T16:08:33.601
++C Merge\sthe\sshared-cache-fixes\sbranch\sinto\strunk.
++D 2013-05-15T17:08:46.108
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1063,7 -1064,7 +1064,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 a58af81483a5facb09d2a80385fc8815b259a10d
- R a1ee9dbf5bdc0c85e6d04c16bdc50678
- U dan
- Z c734661d059ffa1379084a528d255758
 -P d484eaf8d6dfaf2c1065b93b2a52a6db91c09fa4
 -R 2b3d38cfaeff54ce7cad59c19d675f6e
++P b10b9e758b171b0f514592bba70c3ecd17c8c47f 65ff754e3521aa8ee9135d235166cac2a8f57ebd
++R 26e2acdf1151011acbca5696e65a3adb
+ U drh
 -Z adae8d677b3886690161b439bdcd47db
++Z e5ba39f32795e7a7bb7657dbeb366ef9
diff --cc manifest.uuid
index f58cb6a5af,2eaef6834a..5adb8d1dc7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b10b9e758b171b0f514592bba70c3ecd17c8c47f
 -65ff754e3521aa8ee9135d235166cac2a8f57ebd
++5cc1cc55d28a73d390d51fdf6f2c026f1cab1d75