Merge recent enhancements from trunk.

FossilOrigin-Name: 5520f600eade720f465575ab1661dcddaba5adcf

diff --cc manifest
index 2c574e7290e7d2010d7c661be6fa182fa9d91682,1c1653b60ab86929976430a463328fc6607c3fcd..ff2c17ccf8bd4452e24db3a9166af8db9882f1cb
--- 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:46:31.755
- F Makefile.in cfa1ac03c4b414992fd53f24d978b45b0c21de55
 -C Improve\sperformance\sof\ssqlite3VtabImportErrmsg().
 -D 2016-01-20T08:47:55.546
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2016-01-20T12:18:31.407
+ F Makefile.in a476545d0c8626224d0bacac85c6e2967474af81
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 1dc36cfd3c047c9685e539257e158485f16ef035
+ F Makefile.msc 01e855f958932d0d3ed62ec675fc63e2cef61fcb
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -281,17 -288,17 +288,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 04dccbd580639509b927da2a3f926fc70973205e
 -F src/btree.c f224ae877fde69d1a9d430f502edaf8502752dbe
 -F src/btree.h 68ef301795e00cdf1d3ab93abc44a43b7fe771e0
 -F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 -F src/build.c 31af80bba31ac159967951ef58f3144cc7db9d70
++F src/btree.c 7d0dc384f737edf264a3625417f52d2561a0e94c
 +F src/btree.h 8b91bee00ad110e0ae1645ca51d52d23db529380
 +F src/btreeInt.h ca40607c2c9d4b4b7ded98e3d707b15c2f17f1bf
- F src/build.c fd8be668b4171f033790566019c0b80ad9c8d17f
- F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
++F src/build.c 408543fbdded83ff65cee535aa8f787e36a5db7b
+ 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
@@@ -343,7 -350,7 +350,7 @@@ F src/shell.c dcd7a83645ef2a58ee9c6d0ea
  F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 98ad874dbea2fef13f200baa6dc9df9b6b75c422
 -F src/sqliteInt.h 8c1debffeeb1579bdc264d54c72c05892e23b7ee
++F src/sqliteInt.h d2bf936ba54f0696ec257e20f49f9663c790edd0
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -402,20 -409,20 +409,20 @@@ F src/trigger.c 056e51182a3677434423e3b
  F src/update.c 17332f9fe818cbc0444c36a811800af8498af4c3
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c b90d9d38e5e0260c2eafa3cb4c2274d8ea94da27
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
- F src/vdbe.c fd831237035c6d25d89ca131420d1bf8ae3bcbb3
- F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
++F src/vdbe.c 7013f866c0a9d967093a8de5efc21f26eda65fd3
+ F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
  F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
- F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
- F src/vdbeaux.c a05ffe92f6c8edc523b28ef1a4a5947145f0380e
- F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
- F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
+ F src/vdbeapi.c ffae8f5af4570fbd548504e815e9fb7227f0822e
 -F src/vdbeaux.c 07f8f485a6cbc0a62da660f14e303061d45d5cb6
++F src/vdbeaux.c c7854a476860496fd74d9785e571eb2fca964561
+ 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 2390cb2e5cc8529ab4dee92ee8292db1a4f824d8
 +F src/wal.h 327e94c3e366154f52a8d9be9be0ea790cc4e08c
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
  F src/where.c bb69654f841ae7af0a20cc6fb8f0ac57901c31be
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
@@@ -1415,7 -1419,7 +1422,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 e1d2ffc06d47b550ca9447a71443dea08b98d1ad 8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
- R 51a8de6fb41bec6ffe9c6c29c20306b1
 -P ff8eadbed5004ab03438f737492387dee6b9750a
 -R 9def3e1e6201afa0dc73a868079c61c0
--U dan
- Z 6037bb30250c5bc4a0c6399b67d0df45
 -Z 16223910bb7e7f6f85293111cf2f150d
++P fccc5f20c360fa17c3692a9f1fc1d16612632a7f 18d61c8e40ed1466b6a3a2f53bf0eeb09687c20e
++R c5e7135c9880ad67a6f698683df434c2
++U drh
++Z 0f1cff00228814b4a74b5faddee4cad3

diff --cc manifest.uuid
index 2d84e3fb02ee35d07be9b6e4ad19946f5bc79b23,eacc6db99072cd0c75395e87db371332f277383a..fe8f92b5876951bed54750937e090f5230c88706
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fccc5f20c360fa17c3692a9f1fc1d16612632a7f
 -18d61c8e40ed1466b6a3a2f53bf0eeb09687c20e
++5520f600eade720f465575ab1661dcddaba5adcf

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

diff --cc src/vdbeaux.c
Simple merge