Merge all the latest changes from trunk.

FossilOrigin-Name: 7ca58a07d3e6c15b227000daae32a4a0a84948ff

diff --cc main.mk
Simple merge

diff --cc manifest
index 51d890471349438926cd5686c4896a360b202a20,ca75b2f116e79ca907ad0d931a7276c32f2d75b8..a3e0ffd35f28731790fdbfb1fd32164763aeba36
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Add\san\selapsed-time\soutput\sfor\sfaststat1.c.
- D 2016-10-26T12:58:31.518
- F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 -C Fix\sthen\shandling\sof\sthe\s(oversized)\sinteger\sliteral\s-0x8000000000000000.
 -D 2016-11-30T14:47:37.324
++C Merge\sall\sthe\slatest\schanges\sfrom\strunk.
++D 2016-11-30T16:39:40.631
+ F Makefile.in 6b572807415d3f0a379cebc9461416d8df4a12c8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
+ F Makefile.msc bb4d970894abbbe0e88d00aac29bd52af8bc95f4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -311,7 -311,7 +311,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 1e4a0bdbe86b94b46df89e241949dc3156243f0f
 -F main.mk 488af8651f927e27f9256e2f20daf63163b2d2eb
++F main.mk 38b887a18c4dde34b2bb3bea67624fcbe105cc17
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -330,20 -330,20 +330,20 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 4ea67e42541e8a876e469aad20d821746b9a65b3
- F src/btree.h 012576c1d0000e96ccc785c6fe22b4be8211f0d9
 -F src/btree.c 9b30dbe2f6306c50dc5af8296e67034400de37cb
 -F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
++F src/btree.c 7b23553373bcf53137bea4274e06726f10cb7799
++F src/btree.h 14931e081909f9b75009b0b5c5ead6b074204705
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c e22e66fb34e1e50bb7869a510923bfe58db3071a
 -F src/build.c 178f16698cbcb43402c343a9413fe22c99ffee21
++F src/build.c 432a2e267fbb868e9100b15831ae32b2feef0852
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 72c9d01cf446069234e9b54db6fec3e1fc063f58
- F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
+ F src/ctime.c a2a52d6e353f459d8ab0f07321f60fafa47d5421
+ F src/date.c 206d0eb85cedec99a9820929579057fb364a72cb
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
- F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec
- F src/expr.c aac0b8d39373ce8f1d47829ce12c3d7af90c46a6
+ F src/delete.c cac97d1117a3008934da3a6a587b3608e65e1495
+ F src/expr.c b22e09630f874c52db0770973b7ce55ee50c1dde
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c b9ca262f6ad4d030a3cab737ebf9b0b3c8b4ac80
- F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
+ F src/func.c 7057bc2c105b82faa668d8e2ec85fad4540e5c51
  F src/global.c 9da4ca5d74b90715f0ec4957f3d17a4749009f34
  F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
@@@ -374,25 -374,25 +374,25 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
  F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 549ed86833b484fa3cd4799e3289c83b3ace8859
- F src/pager.h 07d6938df0b74e4abe8f57807a8b0e1084321d8b
+ F src/pager.c 4e4aea7ced5734753ccbff4cf4bb4d032cf2173e
+ F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
 -F src/parse.y 0338f906b61e311c2b7e11a3f89b0092c780b664
 +F src/parse.y 07f68096c97093793ed04d69db8bb75e55c3e00e
  F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
  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 a5f0ca08ddede803c241266abb46356ec748ded1
+ F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b
+ F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722
- F src/shell.c f0e8b54c58a8a13cc046f5af6d72de7e0a118a2b
- F src/sqlite.h.in 7ef021d74ac7d4004c784a16ad015508f171c4bf
+ F src/select.c 668c6865b16813dab5f9c18d3672fed11a5c34c5
+ F src/shell.c a3fc2c719ed6d381895cbdb66a4a9b6a791cb02e
+ F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h cf6393ad581d692b886e5281f7bb03b02c2a5f26
 -F src/sqliteInt.h c471d791b10c0f2164c8b7a87adc338e703c09cc
++F src/sqliteInt.h 6fc449b953f6ad92e8b2907e4aa0f5c1385dc524
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -448,19 -448,19 +448,19 @@@ F src/test_windirent.h 7edc57e2faa72702
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 78c8085bc7af1922aa687f0f4bbd716821330de5
- F src/treeview.c f51b75a28b377adde9f79bc3deb6c7770bcf97c0
+ F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c
  F src/trigger.c 3419bb9862983d84d70735fb4c94b21b934cd0c5
- F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
+ F src/update.c 1b8321100cac004f0721ab67b16909dd006e663c
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
- F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
- F src/vdbe.c 55ea5eb95860106a8f665231f8d0c6b55dbf8974
+ F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
 -F src/vdbe.c 336a3e5696683a585e56bbbc4f05ce33957d28dd
++F src/vdbe.c ae5d86ad01500fc5394da1b6b98efd9c1df5ffe2
  F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
- F src/vdbeInt.h d8a56a491b752dbb5f671963b8c861ec72ea875e
- F src/vdbeapi.c 97129bec6b1553da50d8e73f523c278bda66d9f6
- F src/vdbeaux.c 52d9b840859f260ce8418be9333dd77c902e1c74
- F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
- F src/vdbemem.c fcdd73a2001a673f48a244a77b1038928ae729c9
+ F src/vdbeInt.h 9b498d3cb52dc2efb53571fb8ae8e14cf298ce84
+ F src/vdbeapi.c ea4e2dc2213cc6bd7bee375a29a9b51c31b93ae0
+ F src/vdbeaux.c 50a8caa4c8ce8b4c26bad807a6cae89fcc3bdb7e
+ F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
+ F src/vdbemem.c 1af2f14ab0f7004b364933ddcfc767fb880d4742
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
@@@ -1449,9 -1457,8 +1457,9 @@@ F tool/checkSpacing.c 810e51703529a204f
  F tool/dbhash.c a06228aa21ebc4e6ea8daa486601d938499238a5
  F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
  F tool/fast_vacuum.c 5ba0d6f5963a0a63bdc42840f678bad75b2ebce1
 +F tool/faststat1.c 67637f03dced49951f1021bfdc95aa9ffadbe871
  F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
- F tool/fuzzershell.c f294ca67a10e87db76af130d75b2c94be36359c6
+ F tool/fuzzershell.c d5c870a07452caa5c70a8e49d6c64e403558686d
  F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
  F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
  F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
@@@ -1528,7 -1535,7 +1536,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 f7f78147c5d51dfb4c46b2d9afad0648f57d54f3
- R 07c436c3f1f9ce00101fdd43398b0ca9
 -P 9d0d8c2e7c529562889de02346733dcb532e9388
 -R 3cdfa3322e8c1e15bb4a1105ccb3dfa9
++P 7116795134922b7dc6c527365faadf0b9101c1d4 3816bb415ecfd4f36430d0fcbc878e382975de60
++R 231be2eb3a61bda5ae1ad446c7f00d4e
  U drh
- Z e6b7a11750fc2b2a7d9f25143b9afa1a
 -Z 1db6a5b72b559f0fea9bc564b812e94c
++Z 196ed179bcc2c5e68f34e3f8f9b65003

diff --cc manifest.uuid
index 79a16341edbbeb6a23a6eabd6663c9c8d4543d2c,a3846b0f11de5df62a8895d385c02ecea7d64717..4e30c97322b36440579ac0f086995366e7855578
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7116795134922b7dc6c527365faadf0b9101c1d4
 -3816bb415ecfd4f36430d0fcbc878e382975de60
++7ca58a07d3e6c15b227000daae32a4a0a84948ff

diff --cc src/btree.c
Simple merge

diff --cc src/btree.h
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge