Merge the latest trunk changes into the threads branch.

FossilOrigin-Name: 9ac8f1e7115bc50663235adedeb0d3e1234c5740

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 60a99091c5fb8cb70c4bfbef111af3a4cbf9e390,bec4a2d4fe13372f44a1f9f1f0108c791bdbc0e6..7252ec3ac576b045514573f93cb29bc3b19e8656
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Add\snew\sstatic\smutex\sSQLITE_MUTEX_STATIC_APP3.
- D 2014-05-09T11:15:57.314
 -C Include\ssqlite3rtree.h\sin\sthe\stsrc/\spile\sof\ssource\sfiles\sduring\ntarget_source\sin\sthe\smain.mk\smakefile.
 -D 2014-05-07T21:16:56.524
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sthreads\sbranch.
++D 2014-05-09T15:00:32.924
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
 -F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
++F Makefile.in de92112472618cb869d27249966bad1783e4a853
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 7d6981e8e14d8189a2a2f9b4a485f40b2032cb2e
- F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 -F Makefile.msc 7e6c495d9a145054a09f518781916c7503f7a8e9
++F Makefile.msc 93e1932fbc6624b1e8d3b3aa9a9b763114a0f29d
+ F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -144,7 -144,7 +144,7 @@@ F ext/rtree/viewrtree.tcl eea6224b35535
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff
- F main.mk f51f401a87fd07be255bcecae8b03105ca2024e8
 -F main.mk cfa185eed4e0f7e9d28a2e3167cecaa9d6cb39f3
++F main.mk df24b84a07746deb55dbec8ac62c849636c8049d
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -177,8 -177,8 +177,8 @@@ F src/delete.c bcf8f72126cea80fc3d5bc54
  F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
- F src/func.c 2945bb2c4cdc0ac43733046285a4434310be1811
+ F src/func.c 2e16316ec3a6365a0dc3e553c586f91b20f7f6c8
 -F src/global.c 1d7bb7ea8254ae6a68ed9bfaf65fcb3d1690b486
 +F src/global.c b7943ff485c31660ec0b17c68467034804df01b1
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@@ -195,18 -195,20 +195,20 @@@ F src/mem2.c dce31758da87ec2cfa52ba4c5d
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c 74670012946c4adc8a6ad84d03acc80959c3e529
  F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
 -F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
 +F src/mutex.c 84a073c9a23a8d7bdd2ea832522d1730df18812c
  F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
 -F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
 -F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
 -F src/mutex_w32.c ab08c0fc54b71979370ca7c8f42fc64a9f211ebb
 +F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
 +F src/mutex_unix.c 1b10d5413dfc794364a8adf3eb3a192926b43fa3
- F src/mutex_w32.c 6509b34042b0a8cdd8ea849f5987e187a969f225
++F src/mutex_w32.c aedd6752db7caf8b3a2084b1ba03116ff01aa2e3
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
  F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
- F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
+ F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
+ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
- F src/os_win.c 187fad4d385b3b26ec6fd4b703b1b087ad6a5c4d
- F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
 -F src/os_win.c 485d06a93965f306c7281fca0937829292367234
++F src/os_win.c b8c28abae3ddb3c52800a461bda257dfedf5c6ae
+ F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
+ F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
@@@ -218,17 -220,17 +220,17 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 089c4d46f067a5cccae93524c6377f981ba99bd9
 -F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
 -F src/sqlite.h.in 564fc23db33870b5096b20d72df7491ce0b8b74f
 +F src/select.c a5ed3fdc82ebab5b9b095ea1971515a7f8a303d2
 +F src/shell.c 6946aea9f21af551fa84bc6b2a8de55d93bf0004
- F src/sqlite.h.in 3f3934dd2ff0adbd79d259fbbb2eee38a2c12367
++F src/sqlite.h.in 53858ef439c84d794719901226447e8b5defb1b2
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h b2947801eccefd7ba3e5f14e1353289351a83cf3
 +F src/sqliteInt.h 851003126071d4a3bac86a0db75c48197fbd0ff0
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
- F src/test1.c a0e59104fec5626bb1d1bd746157f43e85245e4b
 -F src/test1.c 899bddeb0c7fb2b8062de6f03af4a4e4f48f9df5
++F src/test1.c 268f7f2216eb8c0c2d9e65e6388ae7e499854aba
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -241,7 -243,7 +243,7 @@@ F src/test_async.c 21e11293a2f72080eda7
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c bf2e0bf49ebd8fe3dccabb4542157f9571fe48fa
 -F src/test_config.c dabaa32868974e1ae39770cc17d7e066a9c38e6d
++F src/test_config.c 0530445f9d89a72f2a06915eef20c7bec8923acf
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -270,10 -272,9 +272,10 @@@ F src/test_superlock.c 2b97936ca127d139
  F src/test_syscall.c 2e21ca7f7dc54a028f1967b63f1e76155c356f9b
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
- F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9
+ F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 +F src/threads.c b9daffcb6ae3a9c080da37b905e790d45a8f99db
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
  F src/update.c 5b3e74a03b3811e586b4f2b4cbd7c49f01c93115
@@@ -1139,11 -1138,11 +1143,11 @@@ F tool/mkkeywordhash.c c9e05e4a7bcab8fa
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 752f1a9d3287f6c0ef5738b1c4add0b96fbe0854
- F tool/mksqlite3c.tcl 8da823522f27608494997e1dba19cd426572ba80
 -F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d
 -F tool/mksqlite3c.tcl ba274df71f5e6534b0a913c7c48eabfcbd0934b6
++F tool/mksqlite3c-noext.tcl 88a1e3b0c769773fb7a9ebb363ffc603a4ac21d8
++F tool/mksqlite3c.tcl e72c0c97fe1a105fa9616483e652949be2199fe6
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
- F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
- F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
+ F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
+ F tool/mkvsix.tcl 924dcdecda86969686833301c08f84cca2600d94
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1170,8 -1169,8 +1174,8 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
- F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P a41d29691307067523c8637b486941c5f7c33775
- R dfeb990bf911fd0420714aaa7823f840
+ F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
 -P 68766f837491cb89c2103f2627eb9e23ab326a68
 -R 1b75d6e5e9a19ccc14f8e59e21c749f6
 -U drh
 -Z 3528e73d8f87faaf66e6658213b6d573
++P ee0ab09c80a648e9202757fc04122952375e7c8c 116bed5af664899a73b46dca528ac0c021fc50c3
++R e8e0d3ce5fd31e02042e8e0c64134243
 +U dan
- Z 6074041396d198afcfcf58f3847bacd2
++Z b9842070469fd517448a2bc084149835

diff --cc manifest.uuid
index a410acecfb4460c7effcb990b1b090913b8c636c,150ca3781017ca77e9c4542a0189d2f516daf99d..cc8556fc366375074c9208b31ef521ef1a9514d4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ee0ab09c80a648e9202757fc04122952375e7c8c
 -116bed5af664899a73b46dca528ac0c021fc50c3
++9ac8f1e7115bc50663235adedeb0d3e1234c5740

diff --cc src/mutex_w32.c
Simple merge

diff --cc src/os_win.c
Simple merge

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

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc tool/mksqlite3c-noext.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge