Merge in all the 3.9.0 updates from trunk.

FossilOrigin-Name: 29444149342fc6b1ea8cd34c2c8e1fcb06eaa7ed

diff --cc manifest
index 1db1a35aeb68164ada9e911f2613935b37dcc667,df7ef1745517dff93dc3e9510bab830e73893353..c234b17ae3299ee94713e2d2894a4c2fc74b0fca
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,14 -1,11 +1,11 @@@
- C Merge\strunk\schanges\sinto\sthe\scursor-hints\sbranch.
- D 2015-09-24T15:06:30.389
- F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
- F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
- F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 -C Update\smakefiles\sto\sremove\sall\suses\sof\s"awk"\s-\sto\smake\sbuilding\sSQLite\seasier\non\sWindows\ssystems.\s\sThe\sonly\srequirements\snow\sare\stclsh,\sa\sC\scompiler,\sand\ncommon\sfile\sutilities.
 -D 2015-10-14T20:03:00.297
++C Merge\sin\sall\sthe\s3.9.0\supdates\sfrom\strunk.
++D 2015-10-14T20:09:54.505
+ F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
+ F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
+ F Makefile.msc 9660c072f65b2742595687b30f6d9ae55001ae06
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
+ F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
- F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
@@@ -282,19 -280,19 +280,19 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 9c791540434eef573ea7d3d5b7d77d66678be3d8
 -F src/btree.c 0b74bc28b2dc907cba03b5b4b3b81584273be699
 -F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
++F src/btree.c 7fc9513b151e3ef30369609151a18177b0b3beda
 +F src/btree.h 9cc758f0f1e0002049d9eb0232f9783f21f25ac5
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 8a86f4203ac8a9ac0734f242a96f043edffb6018
+ F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
- F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
+ F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
- F src/delete.c 371df4fc86e96efeaed3d37565aef77f956be109
- F src/expr.c 572ebfeb5c848e8d32096c823f87baa1eb988391
+ F src/delete.c 35c939eb8bacc9dd8a6715964e5f69feb8c20e44
 -F src/expr.c b89dfbb8a385a45411c487355597c01f4ea4c882
++F src/expr.c 7afc6450c3da35127f2ffe8b0412962c46cc0fa6
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
+ F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
  F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
@@@ -340,12 -338,12 +338,12 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 514646c18ed52f2607585e2d7361f26bc3ea460a
- F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in 4e06cb5fed36736242c66237991db6f3e2395eb9
 -F src/select.c 0bc9cd2e1cacfdc9cdc9a83884cc100f166e80a4
++F src/select.c 3e4a4691e11d810b024407d90aa5dd845b1f5aac
+ F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
+ F src/sqlite.h.in dc35357824c6bb84a04acd4e99dee3e07299a8c6
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
- F src/sqliteInt.h b108aac991a28e4208f526df54f82995316c56ee
+ F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
 -F src/sqliteInt.h e21cc96bc24161df7373f6b24367cf580496889d
++F src/sqliteInt.h d2d529e342d5becf735ca2edde2ba1477c935d45
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -403,12 -401,12 +401,12 @@@ F src/update.c dc37664095ca8604293ff1de
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 1704a79d60f9c316adac0cbce09cae1ffc4b6af8
 -F src/vdbe.c 1e0bf8d6a2308ce916d444ef399921407fd5d972
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
++F src/vdbe.c 4d4d88a68c354a62e8d4d3fffa365397e532374d
 +F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 +F src/vdbeInt.h c1508eb4ee04d4db7bdfca5620cfa8ad632fdd62
  F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 +F src/vdbeaux.c 7dccd114c9ee5f801709daecee36464fe6ce71af
- F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
+ F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
  F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
@@@ -417,10 -415,10 +415,10 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c edcaa18b274526a2a74519d5b38ca6845b24dfc2
 -F src/where.c 4c4646675e794ac71e701289edefd7cd81bac844
++F src/where.c 05a178b78c835928d7037c0b2e409b7b656a68a4
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c 16f0d8b39ecf70c10b3c9af40b1fd679cdb4e811
- F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
 -F src/wherecode.c cdfff200d065e7fb1af827b3274ed46b10a91d65
++F src/wherecode.c 4d60b2e8a88adb35851201fa4eff6fbf9aa57ad6
+ F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1389,7 -1391,8 +1392,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 66fe06832614010d3156d7b21a760af9957018cc c6ab807b72ddfc1462f61aa91442b6fac04ace8a
- R 645294bb497caea763068fb2d987fbfc
 -P 7d77233389c595237d5b3d244b8aeca1524290c0 6d9cdb931cf4e2f0830184cff32e441e4966bd7e
 -R b35466bcd9913c829dbd9e3ab76bfe7d
 -T +closed 6d9cdb931cf4e2f0830184cff32e441e4966bd7e
++P fbe637620fb7f2c9395c9ddac77d26746d6d4178 4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8
++R 95393720801ae9935a00efdbdde27bba
  U drh
- Z e6351460f21c4d00d95c8fbc91fe5568
 -Z 46c8c0b0de353ffbb08761cc90f08587
++Z 98cfd2338cc7382cd129bb1eb7f3da88

diff --cc manifest.uuid
index 1d4e637caa31421499a40dcc0ffee5acf0e82139,81258b88be6b044928982a26c0c857a92b2c8b8f..1d90e1ad2ebf2a34c7457751ab79f6ab24a47690
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fbe637620fb7f2c9395c9ddac77d26746d6d4178
 -4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8
++29444149342fc6b1ea8cd34c2c8e1fcb06eaa7ed

diff --cc src/btree.c
Simple merge

diff --cc src/expr.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/where.c
Simple merge

diff --cc src/wherecode.c
Simple merge