Merge recent enhancements from trunk.

FossilOrigin-Name: 325ccfa95e3afed2dc6849d6b05d81f0203bf73e

diff --cc main.mk
Simple merge

diff --cc manifest
index 28a24c284a45a3aea76813cdbadd9fa73786ac1c,b98e432695c1bba907829c82706aa2d2d3d0b8c4..fdd93eef09e9ba5426e30d3d10be5eb0ea5124eb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sall\srecent\senhancements\sfrom\strunk.
- D 2017-01-27T16:24:22.795
- F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 -C Query\splanner\soptimization\sto\sdetect\sempty\stables\sin\sa\sjoin\searly\sand\sbail\sout\nwithout\sdoing\sexcess\swork.
 -D 2017-02-15T22:36:15.061
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2017-02-16T14:02:04.692
+ F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
+ F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION cddd8d88dc8202afa0ebc96da61fc4acbd1e96a5
+ F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -314,7 -318,7 +318,7 @@@ F ext/userauth/userauth.c 3410be31283ab
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 2f07c07d88b44cd4623e426d67b3f9d41e3ea755
 -F main.mk 08e0b151abb46353c677ac4974b50c6077f85eee
++F main.mk 50ef2b2b02d0907151f40a3bcc6abaf9f855b6aa
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -333,17 -337,17 +337,17 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 4be2a8e4a25d4e46499465b84bf1f48c2fd3ce08
 -F src/btree.c 3ae66974881e74df9909093818b4c3428f8d7982
 -F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
++F src/btree.c ab9cb31e13ee1742456230d5a291bac8abea9d23
 +F src/btree.h fef389999fda3984800d55ea563e1b52debe13ab
- F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
+ F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
 -F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
 +F src/build.c 26f9e24b58a801d070a621440fb6624bace28b9f
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
+ F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
  F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
- F src/delete.c 8a444fea8340989d6b1be2e122c55bfc61ce69be
- F src/expr.c f06f41e5e5daca10fb090e70a2502dcc0dbc992b
+ F src/delete.c 0d9d5549d42e79ce4d82ff1db1e6c81e36d2f67c
+ F src/expr.c 38bd92fcbd86b3904bfa29e477412e374b7df5a2
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
  F src/func.c c67273e1ec08abbdcc14c189892a3ff6eeece86b
@@@ -379,23 -383,23 +383,23 @@@ F src/os_win.c cf90abd4e50d9f56d2c20ce8
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c ff1232b3088a39806035ecfac4fffeb22717d80b
  F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
- F src/parse.y 5280d00e80f0fb118437ffc3ffc14c69ca0c87cd
- F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
 -F src/parse.y 591704fce84f814d9a3642774c1f011d38f4149c
++F src/parse.y 26827d624da07780662fa4967ade033b414cb9a8
+ F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
- F src/pragma.c 1ba3574e9afa3ad8444efe58f5b2c46aa5635e96
 -F src/pragma.c 7831956012f5d764761fbd023e59b0ffc08f5e8d
 -F src/pragma.h 61aa5389118594bebb28120a6720401aee34ce1a
++F src/pragma.c 0457012c3c0bbfc193c5e447bd4b64fd300edc1b
 +F src/pragma.h 5d3266fb4d4bbbbcd00cc81342c6357b38ad1ea4
  F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
- F src/printf.c ff10a9b9902cd2afe5f655f3013c6307d969b1fd
+ F src/printf.c 67427bbee66d891fc6f6f5aada857e9cdb368c1c
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 3856db523b942062bca8722ba03b61c324ff94d6
- F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19
- F src/sqlite.h.in 1971ab9709e010d52a02a1a6276d5a2f9b947476
+ F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
+ F src/shell.c a661e7ccd202b16cb5321999354699e5ee018fb2
+ F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 10fbede4b830769f1d56f51a8f3b1222afc2de7d
 -F src/sqliteInt.h 4f85005b109c1a7eab3110cb4568fe30a5389bda
++F src/sqliteInt.h 1c9c511606670c9feb39dcfcbc10477828c4c2f6
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -450,19 -454,19 +454,19 @@@ F src/test_windirent.c 17f91f5f2aa1bb73
  F src/test_windirent.h 5d67483a55442e31e1bde0f4a230e6e932ad5906
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 5c2f516876fc27fbd7753913f032f49eb89e83b5
+ F src/tokenize.c 25ccc63ae2c4163933221f3181c9982b47cd08d2
  F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c
  F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
- F src/update.c b356b29d04c71f33c779f2cb557cf953819bdd7a
+ F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c a88b0466fddf445ce752226d4698ca3faada620a
+ F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c bf7274a1adb1647c662816712d38e1c3e42f234e
 -F src/vdbe.c 16f378640570c24442fd7191b136b5d6380f5c7b
++F src/vdbe.c 35a632d4f0647a90a18d073fd5796e728562977e
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
- F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
- F src/vdbeapi.c 7a65f10684982daecfce50f557f2632b7f20b198
- F src/vdbeaux.c 6847b02aa2db536ed15d90f1fdc2923afef93c5b
- F src/vdbeblob.c 2b3d1ad915dbe5dc92c48759dc18fa8c697e78e5
+ F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
+ F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
+ F src/vdbeaux.c 4122458d33318ab039c4b5da1ca4e7c9221c38e4
+ F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
@@@ -1548,7 -1556,7 +1557,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 89250777b253f90f133d41f5387671429a562c07 d9752c8f7c55426fd7d2b877c5cc3784f93b5349
- R 30a68bd8b72d82648631d5eeafe1ef2c
 -P 830b9235673be55f0c932fb157de03725e648c25
 -R 32e948726be0c8ec843ec4b81e44685b
++P fe86ff54293fbee69126aca9ca9839e3e16d7a1c 58797e9bafa95709e0f706a15f42f93b409e2db5
++R 5310dd6883f39dad6946e3525c6b1916
  U drh
- Z 25bc6a3c364f4045dc512e569eb94b52
 -Z 345aeb62ab5f52d0700dc3107ec5c535
++Z 1faf13fde713514c6504218ba0433691

diff --cc manifest.uuid
index 6f20933be8d5ff49a0565139c5dad8aa315192d8,8b9eddf3bbdfafa7ecda6d73bffb63950b6caa1c..e83f274f6c1078c000a8b069ff5e2694b38947e1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fe86ff54293fbee69126aca9ca9839e3e16d7a1c
 -58797e9bafa95709e0f706a15f42f93b409e2db5
++325ccfa95e3afed2dc6849d6b05d81f0203bf73e

diff --cc src/btree.c
Simple merge

diff --cc src/parse.y
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge