Merge all recent enhancements from trunk.

FossilOrigin-Name: 3ed49691a12455e8583d8b8394ab005124442e89

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 2d1d662d0c7121a6b4bb767ff93e3ab9c738094b,1c1653b60ab86929976430a463328fc6607c3fcd..7440de7bde5be204686d85b8bbc18fbb9875210b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\slatest\senhancements\sand\sfixes\sfrom\strunk.
- D 2016-01-14T15:03:12.742
- F Makefile.in 8b135f17f5b3693bb2b4d0eab7a1bbec5bdf53e4
 -C Improve\sperformance\sof\ssqlite3VtabImportErrmsg().
 -D 2016-01-20T08:47:55.546
 -F Makefile.in a476545d0c8626224d0bacac85c6e2967474af81
++C Merge\sall\srecent\senhancements\sfrom\strunk.
++D 2016-01-20T11:40:31.614
++F Makefile.in 54a13b4520845a7a5f4010f27d4d6e62e9ddea54
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 1dc36cfd3c047c9685e539257e158485f16ef035
+ F Makefile.msc 01e855f958932d0d3ed62ec675fc63e2cef61fcb
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -265,7 -269,7 +272,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 95cf55a591539be53fd52e2856d83ddddfad9681
 -F main.mk 8670f56454bdc59d5e33397bf8c7e43eb33af50c
++F main.mk bb830e3b6d2ff3afd399107eb7941db41a9ac3bd
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -284,17 -288,17 +291,17 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 258d048e423c23398ee29a4fce043839e47ab483
 -F src/btree.c f224ae877fde69d1a9d430f502edaf8502752dbe
++F src/btree.c 3744d1452c518e4ce4fe5905c3b0d1da2fe700d1
  F src/btree.h 68ef301795e00cdf1d3ab93abc44a43b7fe771e0
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 9d497ff4bf3c82cecb520436e0e9963785627583
- F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
+ F src/build.c 31af80bba31ac159967951ef58f3144cc7db9d70
+ F src/callback.c 29ae4faba226c7ebb9aee93016b5ce8a8f071261
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
- F src/date.c e4655393bb403fa310eef66cc4583d75d4d7fd93
+ F src/date.c 997651e3ee6c2818fbf7fcdb7156cef9eb3ece20
  F src/dbstat.c ffd63fc8ba7541476ced189b95e95d7f2bc63f78
  F src/delete.c 00af9f08a15ddc5cba5962d3d3e5bf2d67b2e7da
- F src/expr.c fe55c489362d1429c364e98c877514f4455f45a6
+ F src/expr.c df0d7c3230d59abd679da22ff5ce4cfd0e3a0e63
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e18b3dff7d47c7bcac5ac4fc178a89b9fd322b44
  F src/func.c ccaf46fa98f795673afbfab73dff7c18db88f3cd
@@@ -302,12 -306,12 +309,12 @@@ F src/global.c bd5a0af3f30b0c01be6db756
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 6b45cc86967da11aa024d034745f93f66d53f650
+ F src/insert.c a00e6d8a843dc22e2c136df04e6300c4528d9b9f
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
- F src/main.c d2c79dfc18e2372566aaa95a4f15a452d3cd4206
- F src/malloc.c 8f787669e79de26efc42272b5797bc00fff527c6
 -F src/main.c b686dabe9a7ece9121da87120d5c7bf402d77eb3
++F src/main.c 9bef1b75e748da9b66b5dd7c51151e7c14a45d7b
+ F src/malloc.c b67c26c359c13836d370350b3f43d228dff5b360
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -334,20 -338,19 +341,20 @@@ F src/parse.y caad1e98edeca6960493d0c60
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c c1ab37e1576d22715d3bae4f51658326240a8161
 -F src/pragma.c ea290193369faa0a26ae2f924e7b86289b4a7987
++F src/pragma.c 0200623c368b85c17d1f8e5c43822c110c8df54b
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
- F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
 -F src/prepare.c 74855ddbdfad6a1c4a4d5c4b0913ebb01174ba19
++F src/prepare.c 83985e45b16345d9fa47a8b6ac26f2c8de926edb
  F src/printf.c af589a27b7d40f6f4f704e9eea99f02f18ad6d32
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
+ F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 5b0f2aa9f73ec7b65d1711d485471854d5bad23c
+ F src/select.c 718954db86277d696c520fe671148db1e9c4ed3c
  F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
 -F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
 +F src/sqlite.h.in ab6b985903cff07b173cade4a320a16d4636fbd3
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h da2c7b0ddb1c351ad07bd4eccfb7764bc42ab92a
 -F src/sqliteInt.h 8c1debffeeb1579bdc264d54c72c05892e23b7ee
++F src/sqliteInt.h 90deb66717cb015573a03d6f4e0cb91b8803fae4
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -407,25 -410,25 +414,25 @@@ F src/update.c 17332f9fe818cbc0444c36a8
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c fac06dbf029fea99370a9f28ea567cf3f2ce5dce
- F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 -F src/vdbe.c b90d9d38e5e0260c2eafa3cb4c2274d8ea94da27
++F src/vdbe.c 2a3f8fd43ffee7cb46da83588fe8ec2da40ece14
+ F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
  F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
- F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
- F src/vdbeaux.c c9936e48a10ce7b0fb54b38a9969f8f3aa8000e7
- F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
- F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
 -F src/vdbeapi.c ffae8f5af4570fbd548504e815e9fb7227f0822e
 -F src/vdbeaux.c 07f8f485a6cbc0a62da660f14e303061d45d5cb6
++F src/vdbeapi.c a25beee486c67e7e8ec9768ab7474e1bc51fed35
++F src/vdbeaux.c 1f497eb8efd42a707b8fb381a26121b54309599c
+ F src/vdbeblob.c 37c3d11a753e403698c69e17383d282e1ae73e75
+ F src/vdbemem.c b9181e77eca2a095929d46250daf85c8d2621fc0
  F src/vdbesort.c 0971557e5d3c289e46f56a52aed2197c13251de7
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
+ F src/vtab.c 320682cca733115b4cbe71320b5c5eeb1074ebde
  F src/vxworks.h 974e7d9a98f602d6310d563e1dc4e08f9fc48e47
 -F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c 9bd7a20c656171200725462a37183e53c549afda
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
  F src/where.c bb69654f841ae7af0a20cc6fb8f0ac57901c31be
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
- F src/wherecode.c dfbfe198e418b01f208b489e088edd230c91a4e7
- F src/whereexpr.c eebba8340c90de73b3d3bbe8c43b84559b8e6e2c
+ F src/wherecode.c 8dee26eb181ea9daa8b1a4d96f34c0860aaf99bd
+ F src/whereexpr.c 197a448b52073aee43eca3a2233fc113369eb2d4
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -1417,7 -1419,7 +1424,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 132772d1c415c63fa5bdcc298ad9a3746bfb56bb 8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
- R 5d8ea44daaa28f196e28392ae5b9ab36
 -P ff8eadbed5004ab03438f737492387dee6b9750a
 -R 9def3e1e6201afa0dc73a868079c61c0
 -U dan
 -Z 16223910bb7e7f6f85293111cf2f150d
++P d85774e0dcb6cb1958ecd85891ef785e4692f67b 18d61c8e40ed1466b6a3a2f53bf0eeb09687c20e
++R a1bfb36fb88552af3000d9b70aef6c27
 +U drh
- Z 5cdb85bf33874a22991e0ac32854bf2a
++Z c70308465d6b08a9a871fab62e6bcea7

diff --cc manifest.uuid
index a47c43081c2caa5fe8530da1e7241d7d412489be,eacc6db99072cd0c75395e87db371332f277383a..4d61b60e07a829ee28206eaf8bbd3b308b94de76
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d85774e0dcb6cb1958ecd85891ef785e4692f67b
 -18d61c8e40ed1466b6a3a2f53bf0eeb09687c20e
++3ed49691a12455e8583d8b8394ab005124442e89

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge