Merge updates from trunk.

FossilOrigin-Name: 6b85f8cd4d87d616a3cb362647ae3869c45c2801

diff --cc manifest
index 82284b7b0131aaa3ed8c937b656a0f148235181c,a5c55554866f1a4fd7489ef815a11dfbfc293d2e..7c03eb7b19e5380a7f8ddbdd3cc07c04c821e011
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Experimental\schanges\sto\savoid\srecusrively\scalling\sxMutexInit.
- D 2015-09-13T18:45:50.134
 -C Capture\sAFL-generated\sfuzz\stests\sfor\sjson1.c\sinto\sthe\stest/fuzzdata4.db\sfile.
 -D 2015-09-23T11:59:50.725
++C Merge\supdates\sfrom\strunk.
++D 2015-09-23T15:54:36.389
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
+ F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
+ F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -338,14 -338,14 +338,14 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
+ F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
+ F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
  F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in b7386d2bae6a43ba35be56e0d495b8725998101e
+ F src/sqlite.h.in 4e06cb5fed36736242c66237991db6f3e2395eb9
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
- F src/sqliteInt.h d7b2c30947a49a7538f24c0dca253c0e456c849c
 -F src/sqliteInt.h 5afc6e50402be1e0a870f28e1cd8b32eb9db590f
++F src/sqliteInt.h ed65bcb0a6a7c11978c8f75d5476d6edaa024e8d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -1386,7 -1388,7 +1388,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P b42c2e2076da1a61f667876ff2c18e4ebed50a7f
- R 7600913daf42127c1cd5acb5cae703c1
 -P 7c7a3f3e9bc2f7a7334d8d6eae183d83f22097be
 -R 64646de8f025fcbfbac14050e58f6d8a
 -U drh
 -Z 8d3625ca1ecc6df3eff60cf48fea0eb8
++P c9400ff167d9520119081c9b92436794dcd53d22 10a214fdb3c13b25e0bdd15c975c21c8890c47ee
++R b42897c3c8ae6a403b71a2f426cb59b5
 +U mistachkin
- Z e012d74d229ec0f8fc3b071b4b2b7de3
++Z 6c86ab7133863d50d8bbe949c96c8dea

diff --cc manifest.uuid
index 70a6fb34ecafc2d228538c4673f04409e54b0132,5e8156b16ca730636a94c37d9fa874ec9b0fd272..f5defe22b2b877a8474d0113e87d3b47b78b612a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c9400ff167d9520119081c9b92436794dcd53d22
 -10a214fdb3c13b25e0bdd15c975c21c8890c47ee
++6b85f8cd4d87d616a3cb362647ae3869c45c2801

diff --cc src/sqliteInt.h
Simple merge