Merge all recent enhancements from trunk.

FossilOrigin-Name: 6a7ee04b0ddac36a87d5ed2ac89a53e537f4d5a3

diff --cc manifest
index ee71dadf9a6ff6ec50189b239ce7b2651e5a51fa,bf413d574c0f1f3e73cda260e018b15c962e0b87..c10bdd869b5b1f6be31a31477e5ae18c2a6d4b1f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\svirtual\stable\squery\splanner\senhancement,\sthe\sRTREE\scost\sestimate\nfix,\sand\sthe\sstatement\sjournal\sspill\sdelay\senhancement\sfrom\strunk.
- D 2016-03-07T17:49:17.995
 -C Add\sthe\sSQLITE_OMIT_CODEC_FROM_TCL\scompile-time\soption.
 -D 2016-03-16T01:03:10.251
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\sall\srecent\senhancements\sfrom\strunk.
++D 2016-03-16T01:16:30.929
 +F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
 +F Makefile.msc e6ee58b849c116d5554024f524cbf61f064f6f01
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -321,19 -303,19 +323,19 @@@ F src/complete.c a3634ab1e687055cd002e1
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
  F src/date.c 0b73e681c11fca867fec554750c07fe0d4e417c1
  F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b
 -F src/delete.c 48802aa3ee6339f576d074336d3ae1b5f40e240f
 +F src/delete.c eeac28b3d3d88e3541bdf93e91ea7492a7b67842
- F src/expr.c c4dad2cd6cec00387b75fef4551aff655430dcd2
+ F src/expr.c c329d581e5d631153456369684d7d4bcd94c907d
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 -F src/fkey.c 5cb42d9a59e2a590776fd3fc8ff6f61d40df3c6e
 +F src/fkey.c 5da47ff524e2f687997a74737ce598f043e1342a
  F src/func.c 552d300265aed09eea21f68ac742a440550c0062
  F src/global.c 884d4c7eba9f5fc25c96a23b21520da19b7713e2
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
 +F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
  F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
- F src/main.c e5675877b35bd894e5803588974fc59369d5a6f2
 -F src/main.c 29ea8ebb23ceb5159da167e18d5c807fbb1545c4
++F src/main.c 0a3dc6c0bac5d4abdc74449f895e1599542acfca
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -368,17 -350,17 +370,17 @@@ F src/printf.c 63e6fb12bbe702dd664dc370
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c 137b31daa84d57d67847bf621bb54f3353e2077b
+ F src/select.c 6dd2097bb158efe3b8d68683dcc3b4a49e907a34
 -F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
 +F src/shell.c cd3f82fdc5c895b817a375b7ab8319cb41f447ce
 +F src/sqlite.h.in 86884a006a451c22d342da18d8e373aa70e65ec0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h cd85b90d949c7270266f997ed9796371e6019c53
 -F src/sqliteInt.h 84c673f27b77dfbd367cb3ed1de8b6f3b73102dc
++F src/sqliteInt.h a8838eed1eb20f794ce929597864d070944f15b7
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 23a5c328898b86177b21718834d2b7b4f7bc083c
- F src/test1.c f14a6f9e2cff6cba4d83e2b0c52857f61886cead
 -F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
++F src/tclsqlite.c 56569acc73d36e836b64aefecbbb709a92ba0077
+ F src/test1.c 52965bd684ddcd7f22328ebd7d50fd0b6e51f0d4
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -430,17 -412,17 +432,17 @@@ F src/threads.c 4ae07fa022a3dc7c5beb373
  F src/tokenize.c 3d338cdd00d916ce8a05c397001d64ed58e6fe1c
  F src/treeview.c e4b41a37530a191579d3c53142cc44ee2eb99373
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
- F src/update.c c0016d277a418360456ff6af29363effbd4272f7
 -F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
++F src/update.c 14c6916d0194a7f25ad429292f4831b8c31e93d9
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 12800a93f0664f41575f96799eb881a786d565e6
+ F src/util.c 34ef7be420f82415ec48131404995ddb6ee7502f
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c 9ccb138cb7ac6c1bcda23dfaf52eff1f7761dfe5
 -F src/vdbe.c 8cf45bb8da77d39f55d108e759d15a57acd0255c
 -F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
 -F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 -F src/vdbeaux.c 2c15cf88de4df97428318c8cfac0dea873dae451
 -F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
 -F src/vdbemem.c 9b0cb32cc267ef026515f15a3594d5ff91fe4dfc
++F src/vdbe.c 8e9452b8bc241ae2031c35764b78ae8b4804effb
 +F src/vdbe.h 594aef1a7dcfc2944e2f266f148140c3427fd0f0
- F src/vdbeInt.h a205ce1ece3ab90be78a374e93cb5402fccdf865
++F src/vdbeInt.h 9b704336a69f62ba189eafb06a46171e3463d27b
 +F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
 +F src/vdbeaux.c 325dcf1b944e6d339a5c5210b7b8c5724a8496fb
 +F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
 +F src/vdbemem.c 0bcc4af472ebd36e57603d733a6501573a82b526
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
@@@ -967,10 -950,10 +970,10 @@@ F test/parser1.test 222b5cbf3e2e659fec1
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 1281140205caa8c2a957aa099a25a36fd3ab2f44
- F test/pragma.test 507ac7ef2ea5682241ea0ef041799ca70bb5e0bf
 -F test/permutations.test af8067e4b6d684518956f8e2a744f42bde99014d
++F test/permutations.test cd1fa041074ed08eeaa563e4d1bacb0c69337ec1
+ F test/pragma.test afbf028be1c35b68f57db8eb015c4a3c59d8f28e
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
- F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
+ F test/pragma3.test 3f1984a04657331f838df5c519b443c2088df922
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
  F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
@@@ -1099,11 -1081,11 +1102,11 @@@ F test/tabfunc01.test f977868fa8bb7beb4
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test 7179b4e0bf236ddf0bfa6bfaefa76fbe0a23c28a
 -F test/tclsqlite.test c6d9f546f79d15d0134c1e06583fb3ee0c3afad3
++F test/tclsqlite.test e1306001a0ca92250b691ea6d3cecaca5b6342aa
  F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 9310df7ac540d4e97d8fa4a9605a639801ede65f
 -F test/tester.tcl 859a7ccbe5bd65f0f8b524cd51c318d3edcd3008
++F test/tester.tcl ac5f9558e2fbef44facc1639e3738394dc110852
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1474,7 -1456,7 +1477,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 456df3365e2df60e34762f2024bb551538b3f72b b6c4202432dc96f8f1740f52d0bf872116357fcc
- R 2f497816caa21168c1331f3fb71a39ba
 -P e0b116edd64a55c971c368685aa343cb6beed0f1
 -R 1b0c52bbc749be5b9a732d29d3d099e5
++P 17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165 45f7f0c80bd91a0c7ff859c27fd9e82e551bd83e
++R 7b1ff29ad9cf7b5c8ae4f4645405d6a4
  U drh
- Z a204fd45fac574847e4285c8445e5721
 -Z 5dddb7cbfc6ef15baab9797e73067d60
++Z 05e24502adf6b1cda5add372ab8596b8

diff --cc manifest.uuid
index 4c042e9489ec1676c91ade75b7e71a6d20494da4,3aa4fcd86196784c698bd910fe1e07a52a1b9811..d4116a6ecab819b63e09c027acd1b6f8829e2270
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165
 -45f7f0c80bd91a0c7ff859c27fd9e82e551bd83e
++6a7ee04b0ddac36a87d5ed2ac89a53e537f4d5a3

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tclsqlite.test
Simple merge

diff --cc test/tester.tcl
Simple merge