Merge enhancements from trunk.

FossilOrigin-Name: 66fe06832614010d3156d7b21a760af9957018cc

diff --cc manifest
index 90218d1ba1bdf69769b0606af6b1b1fc09265e2c,e3335b827fbb3b8775f5ab3cdeaf1f2f49ba0eb8..6edcf0f699bbfc09b3acfeb541c7fc0f0782f307
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Add\stest\scases\sto\scover\sfts5\sintegrity-check\scode.
 -D 2015-09-15T14:39:17.597
 +C Merge\senhancements\sfrom\strunk.
- D 2015-09-03T14:39:33.829
++D 2015-09-15T17:31:47.812
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -279,20 -282,20 +282,20 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 3d759d9943ee2ce422a2bb1f7810e7447a907e97
- F src/btree.h 6310645beddbd3eef89fa9b6d1062065976a93c8
 -F src/btree.c d31008cfbf83e3ae5cb96bae3a00f4b57f244a16
 -F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
++F src/btree.c 9d19d3f8dcddd1b644b72f1c6613d44692a7a846
++F src/btree.h 9cc758f0f1e0002049d9eb0232f9783f21f25ac5
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 6c3a8a9b21402a6be98126f7d86b76527e68ca67
+ F src/build.c 8a86f4203ac8a9ac0734f242a96f043edffb6018
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
- F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
- F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
- F src/delete.c 5b4835982c31f12b256dc4d814363a11e7ef34cf
- F src/expr.c 3783aa19150be01a2ae92e1eb429c84a2313c8fc
+ F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
+ F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
+ F src/delete.c 5ab483f15aaf202290227d5dd1f10a7ecce3d6b1
 -F src/expr.c 3a76afcdac925294c39903b7002ddb9e5fd29863
++F src/expr.c 572ebfeb5c848e8d32096c823f87baa1eb988391
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
- F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
+ F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -335,14 -338,14 +338,14 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
+ F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
 +F src/select.c bb99c37242673405683992085a0fcff380b70575
- F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
- F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
+ F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
+ F src/sqlite.h.in 50f83145c6543000b7d27525ecaec59a23d8280b
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h c452759fafe7d6ed9bbdfec19d327a2b77e85d2e
+ F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 -F src/sqliteInt.h 5afc6e50402be1e0a870f28e1cd8b32eb9db590f
++F src/sqliteInt.h b108aac991a28e4208f526df54f82995316c56ee
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -400,24 -403,24 +403,24 @@@ F src/update.c eb7ab3ff2928628692a4f14b
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 9d85fa72a73f7f07789d76602f724be63e998ddc
 -F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
++F src/vdbe.c 1704a79d60f9c316adac0cbce09cae1ffc4b6af8
 +F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
- F src/vdbeInt.h 7258d75fc2dad0bccdef14d7d8d2fd50fd1bf2d2
- F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
++F src/vdbeInt.h c1508eb4ee04d4db7bdfca5620cfa8ad632fdd62
+ F src/vdbeapi.c 0d890f57caf143b114a95ce699e59af51359c508
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 +F src/vdbeaux.c 7dccd114c9ee5f801709daecee36464fe6ce71af
- F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
- F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
+ F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
+ F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6
+ F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 6055bee2f4aff2934ea1965c25c4d1f6368dc0eb
- F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
- F src/wherecode.c 93fa794fcd1aba23454cc15bca2b617bca21ec0a
- F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
 -F src/where.c 882fb44b36201fafc32dd7d59366f852806b7e70
++F src/where.c c03895cdb2624a07e75c95c6889a32a15929a27a
+ F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
 -F src/wherecode.c 186b493599000e640203be0a441223b395dabd24
++F src/wherecode.c c80f4c7866f78b298b81fdda60006d31125b6f68
+ F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1381,7 -1387,7 +1388,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 29570a604806e2a60a8eef7eaf1dce022d2a7004 847387ec8e6fef283899578fb232b2c23b00ee5b
- R af53d4591486f700f0b5e9bcc7196ecf
 -P eade355fafec558fc13dc4b08ca0b07713a2cd84
 -R 1694ed50f41ea37a05fbcbd009cf49d5
 -U dan
 -Z ab887f4a44598b0175c78de8cb058da9
++P 25ee3000e94d60d8c1d7b980f416dcc33eb11105 1d018c35b9e81982df036f5e62a4a42219b54e02
++R 094d10cbcbe8f2ec763e09bd3b0c23d3
 +U drh
- Z 6458a4b1081b59ccab00b014bcb486e3
++Z 515bf273b300e1c6b0d004e464776ff6

diff --cc manifest.uuid
index 73014e7f1200534bee484bff02c75b1d476beb19,7bd70ebd90075dfd67309618a7cd84b1aaa607f6..3cab444f7e456eeeda1e125d74f1337de7645b86
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 25ee3000e94d60d8c1d7b980f416dcc33eb11105
 -1d018c35b9e81982df036f5e62a4a42219b54e02
++66fe06832614010d3156d7b21a760af9957018cc

diff --cc src/btree.c
Simple merge

diff --cc src/btree.h
Simple merge

diff --cc src/expr.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/where.c
Simple merge

diff --cc src/wherecode.c
Simple merge