Merge recent trunk enhancements.

FossilOrigin-Name: c60cdb47612c05c252613e50a8ac10635469fdfe

diff --cc manifest
index 39c4d8e77ade71628629797155d41e162c887d8e,646adca563d24a5dd4f6c130d0a98f2e104b03e5..bbbb0936a4ac63dd1298079e66af88002f4a7001
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stwo\sNEVER()\soperators\sin\sthe\ssqlite3BtreeRowCountEst()\sroutine.
- D 2017-02-23T02:15:33.201
 -C Make\ssure\sthe\sVdbe.expmask\svalue\sis\sset\scorrectly\sin\ssqlite3VdbeSwap().\nThis\sfixes\sa\sproblem\sintroduced\sby\s[a8fd7052].
 -D 2017-03-02T13:13:30.327
++C Merge\srecent\strunk\senhancements.
++D 2017-03-02T13:22:04.261
  F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@@ -338,10 -339,10 +339,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 19746a7db19308053ff6cb2ac002834822809e54
 -F src/btree.c 03149b0f3fec3c1aa3c50a17e997bb442b867632
 -F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
++F src/btree.c 83e2bc48be6e09eb88e312eb791f4bbd96986d93
 +F src/btree.h bf64dfeeddeebdb775a5eba0098bbc00d073290d
  F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
 -F src/build.c 51b473eec465f471d607b54e8dbc00751c3f8a1f
 +F src/build.c 43f903c9082040ced2b421543cb0300c2973647d
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
@@@ -396,11 -397,11 +397,11 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
- F src/shell.c bf976d5301be9d8a4c52852c97909cc9a41ee20d
- F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
+ F src/shell.c 27d2b31099fd2cd749e44d025ef9b54ca26692cb
+ F src/sqlite.h.in 4d0c08f8640c586564a7032b259c5f69bf397850
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h a23e18aebdd0d851c2956a74a3a4f12ff202b472
 +F src/sqliteInt.h df268ce1d04df042cf43b557d2309eb0b71e86c4
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -462,11 -463,11 +463,11 @@@ F src/update.c 456d4a4656f8a03c2abc88a5
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
  F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
 -F src/vdbe.c 83f387d9e6842b1dc99f6e85bb577c5bbc4e397d
 +F src/vdbe.c f520378e510fd36bbf289921798dbc8f2b3dc30d
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
  F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
- F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
- F src/vdbeaux.c 2f48204a0f2875b098ee046bba9265907297b0b5
+ F src/vdbeapi.c 70aabe108c411e529a59d8800445513965334062
+ F src/vdbeaux.c b632f9151a296c5eb22a2cc955c487ebc2347cb6
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
@@@ -1558,7 -1559,7 +1560,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 188300a337c87b7ee0dd1f4b9a4f1bd80e70cca4
- R ea4c0d1070247cd8f7e1aa7ed210345c
 -P ac760db0727209db0a816e112ea5f47e54d54dac
 -R be25bb329cc9311f7d92b42176424b6a
++P 7a959f6d1ea038988cdb4c02d6f37abaec2580a0 29f54b899e5cf22ece98ab41c39c41d75a4b228d
++R 6bb37f552ece3665cee38d0fc37ff06c
  U drh
- Z 01ff8d763fbc7e4c3e39020edd5b116b
 -Z eb983447910676b385a2c6496a637326
++Z 8ce562b5567814952b66c349d10ab9fa

diff --cc manifest.uuid
index 1e1b04c82c89e73c73dd44409c6288656ac9b805,9f406e4ffa3627cc2446ef244be0402762af8efc..e6cd24f62f0d8d360b9f69c4e021b48a29c95469
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7a959f6d1ea038988cdb4c02d6f37abaec2580a0
 -29f54b899e5cf22ece98ab41c39c41d75a4b228d
++c60cdb47612c05c252613e50a8ac10635469fdfe

diff --cc src/btree.c
Simple merge