Merge all recent trunk enhancements.

FossilOrigin-Name: 9a71d56dcea953cb965f1fdda9a8b8f158cdeff6

diff --cc manifest
index 084be630fe03d3d2e8a6ef2c7848dacbd32d0606,a5a0c52194bf641cba0c6c4dbd8fe0833d74502a..101db20db83353b7c59e8169724e9eefe132fce2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Add\sa\snew\shint\sbit\son\sthe\sflags\sparameter\sof\ssqlite3BtreeDelete().\s\sThe\snew\nBTREE_IDXDELETE\sbit\sindicates\sthat\sthe\scall\sis\sto\sdelete\san\sindex\sentry\s\ncorresponding\sto\sa\stable\srow\sthat\shas\salready\sbeen\sdeleted.
- D 2016-01-21T17:06:33.267
- F Makefile.in 7be88f5b473891e3a8c07245ed60535fcda4f9ee
 -C Performance\simprovements\sfor\sfts5,\sparticularly\sdetail=col\smode.
 -D 2016-01-26T20:19:55.225
++C Merge\sall\srecent\strunk\senhancements.
++D 2016-01-26T23:32:55.750
+ F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc c5ead4aa22ff6f528c755b07ed1e31184ac5b3d2
+ F Makefile.msc 6fca5455aaecbd14479f33f091aa19df2d3d2969
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -10,9 -10,10 +10,10 @@@ F art/sqlite370.eps aa97a671332b432a54e
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
- F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d
- F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
+ F autoconf/Makefile.am 1c1657650775960804945dc392e14d9e43c5ed84
+ F autoconf/Makefile.msc 68ed752a809b611d97b95d8572a34fe6fd1196f1
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 -F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa
++F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa w autoconf/README
  F autoconf/configure.ac 7b1ea0dcaf49fafba262ce4b0ee8cb3281b555d1
  F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
  F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
@@@ -288,19 -290,19 +290,19 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 -F src/btree.c f224ae877fde69d1a9d430f502edaf8502752dbe
 -F src/btree.h 526137361963e746949ab966a910c7f455ac6b04
 +F src/btree.c 97cf881292e085ee71faf44f7167b6312965b562
 +F src/btree.h c5dfbbc59226fa5fcc2b03befa85fe10ef23c1b5
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 31af80bba31ac159967951ef58f3144cc7db9d70
+ F src/build.c b4eba1e84752ec9cae7ff3dacd5a8b6d1ab8deb9
  F src/callback.c 29ae4faba226c7ebb9aee93016b5ce8a8f071261
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
  F src/date.c 997651e3ee6c2818fbf7fcdb7156cef9eb3ece20
- F src/dbstat.c ffd63fc8ba7541476ced189b95e95d7f2bc63f78
+ F src/dbstat.c b2ec6793eef97aebb4d171d490a4ffdfa9f2475c
 -F src/delete.c 00af9f08a15ddc5cba5962d3d3e5bf2d67b2e7da
 +F src/delete.c f02e46234c5fc86f6c03ae34dc0ba48e93cd5029
- F src/expr.c df0d7c3230d59abd679da22ff5ce4cfd0e3a0e63
+ F src/expr.c d10c1cdef5810cdbf73adc9f9b383684230b360a
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c e18b3dff7d47c7bcac5ac4fc178a89b9fd322b44
+ F src/fkey.c c66d3e5b35d4d95b5c1e2ee6c12f5df13a7f9ad6
  F src/func.c ba6c03f9e440f5693086c08ee88e6e60212b3504
  F src/global.c bd5a0af3f30b0c01be6db756c626cd3c33a3d260
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
@@@ -345,12 -347,12 +347,12 @@@ F src/printf.c af589a27b7d40f6f4f704e9e
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 718954db86277d696c520fe671148db1e9c4ed3c
+ F src/select.c c34292c8ce7fe69c7cf890d933834a22572bd301
  F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
  F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
- F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
+ F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 46e0bac7a3cdab96e8b5afd1436accc25d2c3d6a
 -F src/sqliteInt.h 74e10a74116df0aec9d4a3e134f1a86cc34c2f14
++F src/sqliteInt.h 0faffdeed20201bedb202cf6ec07f14b29158c66
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -405,12 -407,12 +407,12 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
  F src/tokenize.c 5606871a377f390af7040ec3c12e0d183512d785
  F src/treeview.c 78842e90c1f71269e7a73a1d4221b6fe360bab66
- F src/trigger.c 056e51182a3677434423e3be0c74e61b90b4a663
+ F src/trigger.c 72d876b2d0c66604a112362bdae07dae9b104816
  F src/update.c 17332f9fe818cbc0444c36a811800af8498af4c3
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
- F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
+ F src/util.c 72d40df0a52d3f30b462a15f0e094fcbade6dc82
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c e21a506d17a7397cba16c162d8c9c96e9769c68e
 -F src/vdbe.c 3ffbcc413bf793e3f0b95b79ef2f4bd449a5b5a3
++F src/vdbe.c 6039096edea4ed25f7b1e28aa5d46b0ee3ba73ef
  F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
  F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
  F src/vdbeapi.c ffae8f5af4570fbd548504e815e9fb7227f0822e
@@@ -1419,10 -1422,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 a3cec529f0238e4ca1196fec420f2de80d28db78
- R 76198b2176fddd32b1fb9b7a5f18b4c8
- T *branch * btree-fordelete-flag
- T *sym-btree-fordelete-flag *
- T -sym-trunk *
 -P 4003db4a49c6b623750e56f626fa492c8402067f b4ac61aeee976296e7719949cd4fb496147a29e8
 -R 3b6b6d60ef77e3cea10b7a0c2c39f1b3
 -U dan
 -Z 0416f9e7e1e3c46e17637bea5d350927
++P ac2cbadd8000947c097da5b00c00090fe58fdcff a3d7b8ac53f94d29a11362f193fd1967f30583df
++R 7855243eb7d1aae3e5a98345ca05c333
 +U drh
- Z c987d8ca8053309611f1f75e6c6acde5
++Z 6eda54656ca87ef44dc31ff7472a92ee

diff --cc manifest.uuid
index 57018fb84bef960a60713944d656c47c01d40aef,915fae58aec33596201c00599a6480ab59743fea..7255a707a76bfb82163df6fdbd88bcb30de391aa
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ac2cbadd8000947c097da5b00c00090fe58fdcff
 -a3d7b8ac53f94d29a11362f193fd1967f30583df
++9a71d56dcea953cb965f1fdda9a8b8f158cdeff6

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge