Merge threading fixes from trunk into the sessions branch.

FossilOrigin-Name: 9817a2864eebe2dc90ce505fe0faa8b069ff48ff

diff --cc main.mk
Simple merge

diff --cc manifest
index 25939330c87b183d0a274cf6c8d85191b69fdfa2,012153429fa54ecc25b48064c334b52e56072d59..7b78e82923c0b8af0eea3bdb4523c0ba0df8ca3a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\sKeyInfo\scache\smutex\sfix\sfrom\strunk.
- D 2014-12-09T14:54:26.273
 -C Enhanced\s"stress2"\stesting\sin\sthe\sthreadtest3.c\stest\sprogram.
 -D 2014-12-16T00:20:07.236
++C Merge\sthreading\sfixes\sfrom\strunk\sinto\sthe\ssessions\sbranch.
++D 2014-12-16T01:05:38.517
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 +F Makefile.in 0869fe2a3b7853f048a945fd9cdf671a329b7351
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47
 +F Makefile.msc 212dc90adfad8988134bf3d901a78270d7a9c267
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -169,7 -152,7 +169,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 112ccda703db78f10e0b386723acab2044fd97ed
 -F main.mk 9f8c54fe62b60e0a24a2e65cfc8d2add063dda07
++F main.mk 38ce97d3bcbaffe38869bd178a5f45124e4ee3ff
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -211,8 -194,8 +211,8 @@@ F src/insert.c 4f6df86bbed2d7b59e460173
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
- F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c 6614381d96520d7c73d0fb2eb5291533a6b04d16
+ F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
 -F src/main.c 48e0410a661c629471ca9061d4153245cc9f853b
++F src/main.c ef3c25ce021d5ab6ffd29fcf993183bd31e2f9aa
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -246,16 -229,16 +246,16 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
 -F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 -F src/sqlite.h.in 116dc731361549ee3fc79dcebace11b57d24dcfd
 +F src/shell.c 81e4f2b57396db0714bc73d1f95cf3970f5dcc10
- F src/sqlite.h.in 9e505658e72a84604b7571b6bc78d8a9bde0a9b7
++F src/sqlite.h.in fdd032d889da139009700d7d9b8d0d43c1900c90
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h aff67183ad2b5d29f71a3084e15d16cae96f622c
 -F src/sqliteInt.h d36da9a07130cae13cbfee0986bf20028cb01465
++F src/sqliteInt.h 69c302a3b13d06ebaada7f85497106077df00a24
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
- F src/tclsqlite.c 05be57620509060e85064b9495256c05d56e76b0
- F src/test1.c ebb8cd3c94a2ac8851b7b0b1349284e73a8b4c7a
 -F src/tclsqlite.c c6a21c64da1490e14d53cdc2062d1e2e57942622
++F src/tclsqlite.c 95452a59e1afd0cbce10d5243c480b0d5e1e5f59
+ F src/test1.c 56e33bf6b1827c6ca7520c189131ddd778fb2267
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -308,14 -291,14 +308,14 @@@ F src/update.c d207deb7a031f698104bee87
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
 -F src/vdbeaux.c 6f7f39c3fcf0f5923758df8561bb5d843908a553
 -F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 +F src/vdbe.c c02217423a807dc97c743f5fff493cd55dffa77d
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h dc69f0351bef56456fdba3e09d3387ba4f1b1520
- F src/vdbeapi.c 3d4d2a2b24055ce2cb029fa73067c56616264b51
++F src/vdbeapi.c 90aeb4b3f1dc86d6576a2ce2d5bad12761329bd5
 +F src/vdbeaux.c ccf6b7ca6c7361bdb71d12385b4cff70b395486c
 +F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
- F src/vdbesort.c db015e20a77b25eca4d1e125815f4998a3ca1354
+ F src/vdbesort.c c150803a3e98fbc68bd07772cbbd4328a0a7212d
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
  F src/wal.c 847692349eb6e1fb8543dbc97e69ddbfa4cc7ea7
@@@ -796,8 -781,8 +798,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
 -F test/permutations.test 4e12d43f4639ea8a0e366d9c64e0009afe2eb544
 +F test/permutations.test 5e60eb6ca8429453ab20525dc6ac93d9c41dac6e
- F test/pragma.test 49ac8a73c0daa574824538fed28727d1259fe735
+ F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
@@@ -1244,7 -1232,8 +1250,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5a73da6a3083926a3dafd28c0604122296dc9184 b05340fe3cd5f1676a55023228dc8d1a92de5936
- R 2816a79c9fe6d224099c23041d3622b2
 -P 5b1b697040116048e464b3ebab8395fe088e389a 5648af96d8e2521c5b0cca19f1358374d032394d
 -R 64bec50dd05bb00af986c569d5edb044
 -T +closed 5648af96d8e2521c5b0cca19f1358374d032394d
++P f0940c73bd13cb49a3d229ce2517736324392cfb ae43539e62e76676a3daf561b629a1b9b4e2d2c9
++R 70e65d4afe346251f33a1427d3dba81d
  U drh
- Z 5d345254f96163549bdbecca703eb3ee
 -Z 1075019e3631a6f364d3a72648c7dd6d
++Z b3f332559d7fcfb0fb904c707a0ec975

diff --cc manifest.uuid
index 85c416a6749c684366d24fb0d1f7b89bf54869c3,209ef7a57a651b3648ddcedf4d309ea4d5c5fd1b..ffdfe86a525c04cfd455f660a36f467bd912620e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f0940c73bd13cb49a3d229ce2517736324392cfb
 -ae43539e62e76676a3daf561b629a1b9b4e2d2c9
++9817a2864eebe2dc90ce505fe0faa8b069ff48ff

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge