Merge recent trunk enhancements.

FossilOrigin-Name: 6a513c05850949900f396c7a61accb97cc6d2af5

diff --cc manifest
index 3faf32a87b1b2da86a660c1fafa6f4264d16adf5,5e842820c79e3baef9a3c83f163f3c2be10e893d..0fa6ac3177befbb6ea79fe7db08c20bbdfed0ad4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\senhancements\sfrom\strunk.
- D 2015-09-01T18:52:35.271
 -C Add\sthe\ssqlite3VdbeLoadString()\sand\ssqlite3VdbeMultiLoad()\sroutines\sto\shelp\nwith\scode\sgeneration,\sespecially\son\sPRAGMAs.\s\sRename\ssqlite3VdbeAddGoto()\nto\sjust\ssqlite3VdbeGoto().
 -D 2015-09-03T13:46:12.406
++C Merge\srecent\strunk\senhancements.
++D 2015-09-03T14:48:25.922
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
 +F Makefile.in 00b690660681c22e7ce3a9cbebd69894766ebbd8
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
 +F Makefile.msc a71cfab97780281290f01b212f907d6d438b7e2d
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -307,22 -288,22 +307,22 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
- F src/delete.c 6ecf6e84ad3013adbc996c3fe1b77d5f72f36562
- F src/expr.c 5944e529891416f482250e16c598d8c26e149eb0
 -F src/delete.c 5b4835982c31f12b256dc4d814363a11e7ef34cf
++F src/delete.c 8dbf37c9f81cf4ba8f59d3dc631b6fb4b09a89c3
+ F src/expr.c af2c72f8938413c0c367554962b0d8761121f39d
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 3ce33dd49f12c72376cec9adc7a4d8e7111cedcc
+ F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
  F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 9301b3ddffa1d9f14e6e750b26d5cc86fb028831
 -F src/insert.c bcff4a416177ed90faa8dba65f0266ddad2aeb76
++F src/insert.c b7e0cdf50328870f8a1cacb3ba89daf305b90441
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
  F src/loadext.c dfcee8c7c032cd0fd55af3e0fc1fcfb01e426df2
 -F src/main.c e17fcffae4306a9b8334faf3bac80d7396850b54
 +F src/main.c 9e2e596c97401a7b99f2f500f5e2c725d53eabe2
- F src/malloc.c 19461e159bccf0e2cf06a50e867963d0a7b124a8
+ F src/malloc.c 021012e28a81ffdabf4c30ec3df6ce1f6cc93f1d
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -356,12 -337,12 +356,12 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105
+ F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
 -F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
 -F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
 +F src/shell.c af164c3e8c5d187305fb9187f3b6dd7618aa5726
 +F src/sqlite.h.in 4afdc59b5e5cc9938107144997153a812aa8b5ca
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
 -F src/sqliteInt.h cac6c31a0c7e6aa5572cc97b68d2630034d6d212
 +F src/sqliteInt.h 5dda67f9d2d2a2ada0d28d59b7d18a510aa61942
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -415,20 -396,20 +415,20 @@@ F src/threads.c 6bbcc9fe50c917864d48287
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
  F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c b551ee2dadf47b34312a5cfb5a7139ead3d47bc5
 -F src/update.c 795fba8ebadeb194285b0a73a07f7ad5ae4d0410
++F src/update.c 352eb0f1f32421cf5f276a2301172a99a49181d1
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
+ F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
 -F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
 +F src/vdbe.c 76304f37d020d217ee6cfd3ac632fb4e6fcddb26
- F src/vdbe.h d0f8ab919146109d080cde4b0840af9b5fafad4b
++F src/vdbe.h 67151895e779b35475c6c11b16be2ceb839066c8
 +F src/vdbeInt.h 963c87c4bf8040c0a316ca3e58f8a4888e1fa3c4
 +F src/vdbeapi.c c58b0f5aab970e190b1047c4c6b74769381dcd04
- F src/vdbeaux.c 634a480aaec26e170b4fcfab91697f3cc6788ee8
++F src/vdbeaux.c 4cbd4cc79dad0e2c2b9996ae018d79a7330110f4
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 6c9e261d135fc175da2f34e46d60243a19fffb9f
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a
+ F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1400,7 -1380,7 +1400,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 e9196d566690de0e9815f8cd85be7844322b5a79 1da60c3dda4254620052a83c853c2d2b6dd5009f
- R f39b8d67fa472811f667c334c4e1ce72
 -P d7f4bdf594e93c848f46901637861c8eed4c34df
 -R 87d27a58ce6d4a6cd03f169f2370f2fe
++P cb77236673e30af1e8749d984dedecc8f901b255 847387ec8e6fef283899578fb232b2c23b00ee5b
++R 3067aa3f36091d5700863465d026f2a3
  U drh
- Z 760ecb4a8ede1ee2af06746289d94396
 -Z bdbaccc5e83ea81c60c1b2c883af5b3e
++Z ab63c2ebd89dcf93f54b64f43853b54b

diff --cc manifest.uuid
index 21438e78331c5bd2cea8f769d32d839549bbcf20,3428834616b9d6af58a4775744166c3ed538397d..fc1eda7cd120670e35ffe2b429d68bea0145cad2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cb77236673e30af1e8749d984dedecc8f901b255
 -847387ec8e6fef283899578fb232b2c23b00ee5b
++6a513c05850949900f396c7a61accb97cc6d2af5

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge