Merge all the latest enhancements from trunk.

FossilOrigin-Name: 924f471291dfd458307a11819aa640cc1a02ac63

diff --cc manifest
index fde7b0ea6a93c8aae7425fd56466dc828cadbdaa,1771c7814922248f382e3cefa63b1677ca866369..ca5e17e174c59d645e7274bca62a16fb2bd670d4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\senhancements\sand\sfixes\sfrom\strunk.
- D 2015-06-17T18:18:51.003
 -C Remove\sa\sNEVER()\sthat\sis\sin\sfact\sreachable.
 -D 2015-06-25T15:21:52.642
++C Merge\sall\sthe\slatest\senhancements\sfrom\strunk.
++D 2015-06-25T15:44:49.660
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 +F Makefile.in 5f56f6186fdbd0fb33226e9d2279acde3b3fa88b
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
 +F Makefile.msc 3165ac5ae2fee79cf7d5e025b879f7a52ae66776
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -220,8 -201,8 +220,8 @@@ F src/complete.c a5cf5b4b56390cfb7b8636
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
 -F src/delete.c 8857a6f27560718f65d43bdbec86c967ae1f8dfa
 +F src/delete.c b998fbc3c55e8331a5f40aa7ff80972254de8de1
- F src/expr.c fbde754df3fa10bbd3a1dcea08e77b0f1684d188
+ F src/expr.c 32c836d9fa22c25371039febf074849dcefb3de9
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
  F src/func.c a98ea5880dc50e9ca6dd6f57079a37b9cfcdecf1
@@@ -267,14 -248,14 +267,14 @@@ F src/pragma.h b8632d7cdda7b25323fa580e
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c db11b5960105ee661dcac690f2ae6276e49bf251
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 84c571794e3ee5806274d95158a4c0177c6c4708
+ F src/resolve.c 2d47554370de8de6dd5be060cef9559eec315005
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 45a814a755f90c1a6345164d2da4a8ef293da53d
- F src/shell.c 09565d8e9a2604e503f3d4e39b55ceaaea3446c7
+ F src/select.c 9baeda79f93cfd180d471273a2f9c82c682a37a2
 -F src/shell.c 8af3cced094aebb5f57a8ad739b9dafc7867eed7
 -F src/sqlite.h.in 76d2f5637eb795b6300d9dd3c3ec3632ffafd721
++F src/shell.c e4ad9031072a6d679b2c69a780014d30db62dc7f
 +F src/sqlite.h.in 876ad21b9a6bb5034db7c44cdebd5df2292a5336
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h be1a718b7d2ce40ceba725ae92c8eb5f18003066
- F src/sqliteInt.h 152c1a4cf6858d9724aa79d8cf2e42377ee58194
 -F src/sqliteInt.h d5df694bc33870e77fb08f389d12309597fe3059
++F src/sqliteInt.h dc4d9615bc38d5eaaaf95b7a5e98267615c51ee7
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -326,19 -307,19 +326,19 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
- F src/treeview.c 84aa2d2ed26627ccc8dd3a2becfa18dc86ee4607
+ F src/treeview.c c84b1a8ebc7f1d00cd76ce4958eeb3ae1021beed
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
 +F src/update.c 24dd6a45b8b3470e62702128ebf11be1f2693145
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c a6431c92803b975b7322724a7b433e538d243539
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c abef10c8329ae4a29f56e0f2d23e15cf6e8c5677
 -F src/vdbe.c 3af2d06e2b36012631dc3331957df52febdf8678
 -F src/vdbe.h 90048aea1910f9df93e6044592bd4a466dc9c5e7
 -F src/vdbeInt.h 20295e482121d13437f69985f77db211cdc8bac1
 -F src/vdbeapi.c 6a0d7757987018ff6b1b81bc5293219cd26bb299
 -F src/vdbeaux.c 4c82d6f686f72ea7d266d26d528a171b728626f7
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c 4e947cd322bb531e3f7f6f58f0f536d182b38ef8
++F src/vdbe.c 60917660c84745cb644d4ddd750301fe0649ccd0
 +F src/vdbe.h 218e957540f5e0866501d2b546ded647c86b8d84
 +F src/vdbeInt.h 571977048ae46b947fb8bbbd1332e5d98f1ca845
 +F src/vdbeapi.c a5d2e8afd53b4f81934f5ca59c04465cd1a6d50d
 +F src/vdbeaux.c 73788765a2d43514822fbcb2a69068fb48f4dcdd
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
- F src/vdbemem.c 05e4f9302fb183c37373908bc33c04c8859015b5
++F src/vdbemem.c 9b6436ec92a4516df614f55c0ad7be2fc464527a
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c c535e80259ebe616467181a83a4263555b97c694
@@@ -684,10 -665,10 +684,10 @@@ F test/fuzzer1.test d4c52aaf3ef923da293
  F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
  F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
  F test/hexlit.test 1d312fa816dfd3650a3bb488093bc09a0c927f67
 -F test/hook.test 162d7cef7a2d2b04839fe14402934e6a1b79442f
 +F test/hook.test aa41c095d26822b8a51aa4c82904a14347961be6
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
- F test/in.test b52fa96bcf6cebc5c8829c822315d0f87af9c6c2
+ F test/in.test 61a24ae38d4b64ec69f06ccdf022992f68a98176
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
@@@ -1306,7 -1286,7 +1306,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 c39cb0e2571f58c87053de009e2c135d71b2c3af fc4f4d1eccec2e09b5d2e6c4da082204f4d5a016
- R b0895354eaa33e80f7f008da5f4f3c57
 -P d007bc339b9ea6d59a3dd2b0c5e77e9c801b16f6
 -R b3d0d7d3ac81c0743783e0e414777712
++P 199bfb67fdf642cca6cd5d460fa4dc602b94837a f824e66b0dc120bed227c7446e2663fcad7cc4f6
++R b6a4a6a3d66ab4b5ed5e1b39669d179f
  U drh
- Z 0081592a2aae788aeca7ea387179f084
 -Z ec9d3f29e33fb82221154b9d11e7c8ba
++Z d59c65de498941f5f2907132a991b726

diff --cc manifest.uuid
index 7ae2545cafa1ef3779212d2d87a58fbb9a3e1298,3239fd0d3d41c9232c48f34582e052cd8a140945..19f1c7fce378dd4643a246a306071beb57bdeaf5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 199bfb67fdf642cca6cd5d460fa4dc602b94837a
 -f824e66b0dc120bed227c7446e2663fcad7cc4f6
++924f471291dfd458307a11819aa640cc1a02ac63

diff --cc src/shell.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbemem.c
Simple merge