Merge recent enhancements from trunk.

FossilOrigin-Name: 4768a1066cb9c7627064d7efec44188d6755cb03

diff --cc manifest
index 2542b4f4ed39c0326d6976ccda86e84a33d49d61,28fe5360f6673f92d5cba613ca453f4b867e5ae8..22c5f502bfbea66921fd02d554acebf5ef7d7f80
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Simplify\sthe\svector\scomparison\scode\sgenerator\slogic,\sand\sthe\sresulting\nVDBE\scode.
- D 2016-08-18T15:15:29.853
 -C Rename\sthe\sDb.zName\sfield\sto\sDb.zDbSName\sto\smake\sit\smore\sdescriptive\sand\sto\ndistinguish\sit\sfrom\sall\sof\sthe\sother\s"zName"\svariables\sscattered\sthroughout\nthe\scode.
 -D 2016-08-18T14:33:11.816
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2016-08-18T15:21:16.759
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -336,11 -336,11 +336,11 @@@ F src/callback.c 2e76147783386374bf01b2
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
  F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
- F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0
- F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
+ F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
+ F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
 -F src/expr.c 9c5eca8602f6c496e8d4eefefe2aae3d831dd510
 +F src/expr.c d79a02ba0f5b44c3319154641247979c48eec637
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413
+ F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
  F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
  F src/global.c c45ea22aff29334f6a9ec549235ac3357c970015
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
@@@ -377,19 -377,19 +377,19 @@@ F src/parse.y a7402dff6fe8238795f15ca19
  F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812
- F src/pragma.c c8b499756658cb8b82cfdbb5845c22cf11f297aa
+ F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
- F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
+ F src/prepare.c a668988f324961397305b8352cf6bd87776fb347
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 0392c6686586b1d4dac9a4106959f03ddd70e9aa
+ F src/resolve.c d67b9a5cc33339256e2088c5a722745fc2ff5219
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 228eec644a778a31763b3d384d1ee1a5e3cf2349
 -F src/select.c 890c32eab22061b57eb2bddcbb55d6af87db7d12
++F src/select.c 3a5ddce5d3773c42e4bd96ee93e758c22cbc59ae
  F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
  F src/sqlite.h.in 0f7580280d1b009b507d8beec1ff0f197ba0cc99
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 98d9ccfa30c0d4b1b886ed61f409dc6b307e9b0f
 -F src/sqliteInt.h f81e279da1bae217d9afcc60d5580a0d4615727e
++F src/sqliteInt.h 1b51d9e1ae63476fbe69423d531afdefab8aa18f
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -445,21 -445,21 +445,21 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 78c8085bc7af1922aa687f0f4bbd716821330de5
  F src/treeview.c c56d6ddbed564efda746236b35bcbb8238daac4b
- F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
- F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
+ F src/trigger.c 11e20b3b12c847b3b9055594c0f1631266bb53fc
+ F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
- F src/vacuum.c 9dd2f5d276bc6094d8f1d85ecd41b30c1a002a43
- F src/vdbe.c 1b66646c30ae83db67edce52f62801e6204a6e47
+ F src/vacuum.c f6f10c88f8af5feb6b3632e5e4133e4482819c4f
 -F src/vdbe.c 6242a21f22a68899db5e758c69a32cad163585e2
++F src/vdbe.c 9a1c5a2d1980ca6a111ce8649e06ed8c790ee1fc
  F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
  F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
- F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
+ F src/vdbeapi.c a32d61b7dd05e6890d8fd44d2805f55e2f5ba9f3
  F src/vdbeaux.c a32d79aeaa88dc2b97c261172d952d395254a055
- F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
+ F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
 -F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
 +F src/vdbemem.c 77d6505956bf4e45c328ab3ebef6b461334cab5d
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c 6b3cfaff7e4397739d6b48511e777ca58c6d06d4
+ F src/vtab.c 5ca4fa8b028f9e2ed4793ee1670911a83cfcefd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
  F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
@@@ -1516,8 -1510,7 +1516,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 381aa73141db8ec59adbcb09e71af660ee4ae5ce c54bd9c82dd34951dc87848c0b19fcccaef928db
- R 4db42b6f0c7885d63148768f55fefe94
- T +closed c54bd9c82dd34951dc87848c0b19fcccaef928db
 -P a861713cc6a3868a1c89240e8340bc7b2b9559da
 -R 99cc7186f7854d08151b32f71928925d
++P e2ad0b5d8e1e83118c12889150aca2f2a6b2bdde 92a22f01343a898455fd61c3b8e7d7c954f5b569
++R a3d6c4bcdda8d18e3de85b224695f9f6
  U drh
- Z 3cfa77acd6574617a13d27cce1aa0dbe
 -Z 208eab983f2b557e0d2dff78ec685958
++Z 554fed64519eb39711e06c16c9610431

diff --cc manifest.uuid
index 6d15ad67b831eec8239977cb22cbf7f3547e328e,7bc875b98560c5b227bedf86d2e97e41f1cd23e7..a8a1479273fe60ac92ba2d540eaa8ca8a83bf5bc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e2ad0b5d8e1e83118c12889150aca2f2a6b2bdde
 -92a22f01343a898455fd61c3b8e7d7c954f5b569
++4768a1066cb9c7627064d7efec44188d6755cb03

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge