Merge recent enhancements from trunk.

FossilOrigin-Name: dc006e08b80758b8ac3addd98a532b074b5ca132

diff --cc main.mk
Simple merge

diff --cc manifest
index a3e0ffd35f28731790fdbfb1fd32164763aeba36,acfaf94242b8300c2ff935d6dec734875d10798f..f33d9d9878147027dc7027c1a7a21667db27bcd5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\sthe\slatest\schanges\sfrom\strunk.
- D 2016-11-30T16:39:40.631
- F Makefile.in 6b572807415d3f0a379cebc9461416d8df4a12c8
 -C Performance\soptimization\sin\ssqlite3PagerWrite().
 -D 2016-12-12T11:05:15.832
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2016-12-12T12:58:55.427
+ F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc bb4d970894abbbe0e88d00aac29bd52af8bc95f4
+ F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -311,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 38b887a18c4dde34b2bb3bea67624fcbe105cc17
 -F main.mk da18a283b8fc3c6892e9205e6228f3ae60d8cd8d
++F main.mk 9586576fffbf7dc2b7c8b09b5ad27142a6e974f9
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -328,23 -329,23 +329,23 @@@ F src/analyze.c 8b62b2cf4da85451534ac0a
  F src/attach.c f6725410c184a80d8141b294fdf98a854c8a52b5
  F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
- F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
+ F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 7b23553373bcf53137bea4274e06726f10cb7799
 -F src/btree.c 383ce69bd36b0f409bfb8bd028786b2f0a4cbb24
 -F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
++F src/btree.c 328113973f9abd1f0ea7ab39b4e3448a4a081dd6
 +F src/btree.h 14931e081909f9b75009b0b5c5ead6b074204705
- F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
+ F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
 -F src/build.c 178f16698cbcb43402c343a9413fe22c99ffee21
 +F src/build.c 432a2e267fbb868e9100b15831ae32b2feef0852
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c a2a52d6e353f459d8ab0f07321f60fafa47d5421
- F src/date.c 206d0eb85cedec99a9820929579057fb364a72cb
+ F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
+ F src/date.c b48378aeac68fa20c811404955a9b62108df47d8
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
- F src/delete.c cac97d1117a3008934da3a6a587b3608e65e1495
- F src/expr.c b22e09630f874c52db0770973b7ce55ee50c1dde
- F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c b9ca262f6ad4d030a3cab737ebf9b0b3c8b4ac80
- F src/func.c 7057bc2c105b82faa668d8e2ec85fad4540e5c51
- F src/global.c 9da4ca5d74b90715f0ec4957f3d17a4749009f34
+ F src/delete.c 42768e673861dffec92664b2036da6be51720e49
+ F src/expr.c 84a5e590184ad7ccae22e7ad484d6394dec46f16
+ F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
+ F src/fkey.c 4017dc6d8bf894c4818ffbaf392e53c7c68dd761
+ F src/func.c 43916c1d8e6da5d107d91d2b212577d4f69a876a
+ F src/global.c 235021a21ee2cb52b304589f8f9e85a36bbe24fa
  F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
@@@ -371,28 -372,28 +372,28 @@@ F src/os.c add02933b1dce7a39a005b00a2f5
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
+ F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
  F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 4e4aea7ced5734753ccbff4cf4bb4d032cf2173e
+ F src/pager.c b6f38fc2f0da8eafe6ccfbf0b12e228b2ce5fb76
  F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
- F src/parse.y 07f68096c97093793ed04d69db8bb75e55c3e00e
- F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
 -F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
++F src/parse.y 5280d00e80f0fb118437ffc3ffc14c69ca0c87cd
+ F src/pcache.c 219fc5238d5c80e2990ab01e1459db3a96866447
  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 ba2679f80ec82c4190062d756f22d0c358180696
+ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 668c6865b16813dab5f9c18d3672fed11a5c34c5
- F src/shell.c a3fc2c719ed6d381895cbdb66a4a9b6a791cb02e
+ F src/select.c b4bd43e1233c87e8a7cf66150421997b0396417e
+ F src/shell.c 9597efa50a4a27bc6440ad99cbcd7fff6957f514
  F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 6fc449b953f6ad92e8b2907e4aa0f5c1385dc524
 -F src/sqliteInt.h 9d0834b980e2d156109d73c307b803d29d2686e8
++F src/sqliteInt.h 43422c7417484971a9a3b62a7953afec57921555
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -447,21 -448,21 +448,21 @@@ F src/test_windirent.c 600398db0198ca1c
  F src/test_windirent.h 7edc57e2faa727026dbd5d010dd0e2e665d5aa01
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 78c8085bc7af1922aa687f0f4bbd716821330de5
+ F src/tokenize.c 6eb0752c4fd191f789190c3708ee5b0060fd2829
  F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c
  F src/trigger.c 3419bb9862983d84d70735fb4c94b21b934cd0c5
- F src/update.c 1b8321100cac004f0721ab67b16909dd006e663c
+ F src/update.c 1da7c462110bffed442a42884cb0d528c1db46d8
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
+ F src/util.c e68e8ced7328f22d2cf7b4c898c394a0de34cdf1
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c ae5d86ad01500fc5394da1b6b98efd9c1df5ffe2
- F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
- F src/vdbeInt.h 9b498d3cb52dc2efb53571fb8ae8e14cf298ce84
 -F src/vdbe.c 2d90c42f2117b36e92c3af6a9c9f380b22e6e3b8
++F src/vdbe.c d631e04a53401ab4ceeac38dd95f57cc96f654ec
+ F src/vdbe.h 0c74f6305fb43b9b282dacaff102272370e327d4
+ F src/vdbeInt.h 42e498dbe96475dbb3fda3d85d8fd2a87eff60a2
  F src/vdbeapi.c ea4e2dc2213cc6bd7bee375a29a9b51c31b93ae0
- F src/vdbeaux.c 50a8caa4c8ce8b4c26bad807a6cae89fcc3bdb7e
+ F src/vdbeaux.c f5edc89007f8a49e224089a4a4dddbc11bd38213
  F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
- F src/vdbemem.c 1af2f14ab0f7004b364933ddcfc767fb880d4742
- F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
+ F src/vdbemem.c d3fd85b7b7ef3eb75de29c6d7e1d10d3ca78b4fd
+ F src/vdbesort.c bb34eed4fb52e11ac037dccea4ee3190594c7f9e
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
@@@ -1536,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 7116795134922b7dc6c527365faadf0b9101c1d4 3816bb415ecfd4f36430d0fcbc878e382975de60
- R 231be2eb3a61bda5ae1ad446c7f00d4e
 -P 4fc6580ffa7232aaf751f38f90c45edc8863abe5
 -R bc14df45b85bb125e9e5bbeaef507f4a
++P 7ca58a07d3e6c15b227000daae32a4a0a84948ff d4dff10a3d4edf8e1cc77c0a4f185d33f2c2e953
++R 5a59f6a7383b96dd8f6d74bffb54bf80
  U drh
- Z 196ed179bcc2c5e68f34e3f8f9b65003
 -Z 4c6df250e0c9c71056406dc87d5d9884
++Z 9cec14060f032e97d4fcc849bf2d32ea

diff --cc manifest.uuid
index 4e30c97322b36440579ac0f086995366e7855578,cdd0155282294b3e7d3d76f52887dd56dc847199..6c5b991bffb53bb1e6610110127db5f95331a409
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7ca58a07d3e6c15b227000daae32a4a0a84948ff
 -d4dff10a3d4edf8e1cc77c0a4f185d33f2c2e953
++dc006e08b80758b8ac3addd98a532b074b5ca132

diff --cc src/btree.c
Simple merge

diff --cc src/parse.y
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge