Merge recent trunk enhancements.

FossilOrigin-Name: 74a0ca1f152d6d8454787557c6e990efe0e47a50

diff --cc main.mk
Simple merge

diff --cc manifest
index f33d9d9878147027dc7027c1a7a21667db27bcd5,b952a95fe58710a1ff0b71ae8ddca5670e3dbb76..9f2f0544a071e58b98c8eef5e8fdf789cc7142de
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\srecent\senhancements\sfrom\strunk.
- D 2016-12-12T12:58:55.427
- F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
 -C Fix\sa\sproblem\scausing\sthe\splanner\sto\sgenerate\ssub-optimal\splans\sfor\ssome\squeries\nthat\suse\srecursive\sWITH\ssub-queries\swith\sLIMIT\sclauses.
 -D 2016-12-16T15:05:40.539
++C Merge\srecent\strunk\senhancements.
++D 2016-12-16T15:57:40.254
+ F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -312,7 -312,7 +312,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 9586576fffbf7dc2b7c8b09b5ad27142a6e974f9
 -F main.mk bd1149fdb5543e432a8530a0ea7642613a655bc1
++F main.mk 2476a37aa8a70a69efe54a004351f8ae7844f751
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -331,10 -331,10 +331,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 328113973f9abd1f0ea7ab39b4e3448a4a081dd6
 -F src/btree.c b2055dff0b94e03eaad48a760984a2d8e39244e6
 -F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
++F src/btree.c 7892be7e019565f6e5d2df6bda94befa7d91c9a0
 +F src/btree.h 14931e081909f9b75009b0b5c5ead6b074204705
  F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
- F src/build.c 432a2e267fbb868e9100b15831ae32b2feef0852
 -F src/build.c 854ec3a222d2872df5351339f7af4002e64fdd1a
++F src/build.c 182877f27be4129ffd385b80f3318251a605152b
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
@@@ -375,14 -375,14 +375,14 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
  F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c b6f38fc2f0da8eafe6ccfbf0b12e228b2ce5fb76
+ F src/pager.c 81fe2bb847df537694ec39e28e8b3dc221c64a7d
  F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
 -F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
 +F src/parse.y 5280d00e80f0fb118437ffc3ffc14c69ca0c87cd
- F src/pcache.c 219fc5238d5c80e2990ab01e1459db3a96866447
+ F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44
 -F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 +F src/pragma.c 6ca8fb0a4da012c4ec4e92c76d868dca97ac6a03
 +F src/pragma.h 74d46e32bdc7abb2d01710162ff96cfb483699b6
  F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
  F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
@@@ -393,7 -393,7 +393,7 @@@ F src/shell.c f1c7fde7a83421e6ed620df41
  F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 43422c7417484971a9a3b62a7953afec57921555
 -F src/sqliteInt.h 657a892d885253768c82f1e04e8053468b13cb6a
++F src/sqliteInt.h d4b1e6a694ed35bc669c9c99e0dea35e76e357f8
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -455,7 -455,7 +455,7 @@@ F src/update.c 1da7c462110bffed442a4288
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c e68e8ced7328f22d2cf7b4c898c394a0de34cdf1
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c d631e04a53401ab4ceeac38dd95f57cc96f654ec
 -F src/vdbe.c 64c3426893e1660bde7446c242468926555e3650
++F src/vdbe.c accfa7875623a5efa6108c75581e6588a342a643
  F src/vdbe.h 0c74f6305fb43b9b282dacaff102272370e327d4
  F src/vdbeInt.h 42e498dbe96475dbb3fda3d85d8fd2a87eff60a2
  F src/vdbeapi.c ea4e2dc2213cc6bd7bee375a29a9b51c31b93ae0
@@@ -1436,11 -1436,11 +1436,11 @@@ F test/win32longpath.test 169c75a3b2e43
  F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
  F test/with1.test cef099a491eac9874f2c28bd2dc86394fb3e47b3
  F test/with2.test 2b40da883658eb74ad8ad06afabe11a408e7fb87
- F test/with3.test 511bacdbe41c49cf34f9fd1bd3245fe1575bca98
+ F test/with3.test e71604a0e53cba82bc04c703987cb1d6751ec0b6
  F test/withM.test 693b61765f2b387b5e3e24a4536e2e82de15ff64
 -F test/without_rowid1.test 1a7b9bd51b899928d327052df9741d2fe8dbe701
 +F test/without_rowid1.test eaac24556ed2dfaf84d8a32fac46229bd61b1015
  F test/without_rowid2.test af260339f79d13cb220288b67cd287fbcf81ad99
- F test/without_rowid3.test aad4f9d383e199349b6c7e508a778f7dff5dff79
+ F test/without_rowid3.test 2724c787a51a5dce09d078453a758117b4b728f1
  F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a
  F test/without_rowid5.test 89b1c587bd92a0590e440da33e7666bf4891572a
  F test/without_rowid6.test 1f99644e6508447fb050f73697350c7ceca3392e
@@@ -1537,7 -1536,7 +1537,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 7ca58a07d3e6c15b227000daae32a4a0a84948ff d4dff10a3d4edf8e1cc77c0a4f185d33f2c2e953
- R 5a59f6a7383b96dd8f6d74bffb54bf80
 -P 8d646905b830d5bb29092e103ac5cb499b3c7e5a
 -R 147fd014e993bf990284d024622f7825
 -U dan
 -Z ececc9941f2e958f0280d3f055b0e66d
++P dc006e08b80758b8ac3addd98a532b074b5ca132 053a149cc8244a7f85137129cfcb8622efe90306
++R 622e5a34bc63b8a2c15e428113c053e3
 +U drh
- Z 9cec14060f032e97d4fcc849bf2d32ea
++Z 935fedef2d7541845766cdea56b5f368

diff --cc manifest.uuid
index 6c5b991bffb53bb1e6610110127db5f95331a409,7e8bf801a0e23c7f5c644e94ab12629db394f6e3..babbdd40c0004b05de8ef153a40a1eac79a7ac0f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dc006e08b80758b8ac3addd98a532b074b5ca132
 -053a149cc8244a7f85137129cfcb8622efe90306
++74a0ca1f152d6d8454787557c6e990efe0e47a50

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge