Merge enhancements from trunk.

FossilOrigin-Name: 25ee3000e94d60d8c1d7b980f416dcc33eb11105

diff --cc manifest
index 168ed0627a6cd70441ec792ae4e94045498235e2,5e842820c79e3baef9a3c83f163f3c2be10e893d..90218d1ba1bdf69769b0606af6b1b1fc09265e2c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Add\sthe\ssqlite3VdbeLoadString()\sand\ssqlite3VdbeMultiLoad()\sroutines\sto\shelp\nwith\scode\sgeneration,\sespecially\son\sPRAGMAs.\s\sRename\ssqlite3VdbeAddGoto()\nto\sjust\ssqlite3VdbeGoto().
 -D 2015-09-03T13:46:12.406
 +C Merge\senhancements\sfrom\strunk.
- D 2015-09-01T18:31:19.659
++D 2015-09-03T14:39:33.829
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -279,19 -279,19 +279,19 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c b8083a37c09df6a30af497086d7ba05c1526d359
 -F src/btree.c 4084d9eed2817331f6e6a82230ba30e448cad497
 -F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
++F src/btree.c 3d759d9943ee2ce422a2bb1f7810e7447a907e97
 +F src/btree.h 6310645beddbd3eef89fa9b6d1062065976a93c8
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 511b02138eddc3cf68dab1016da4998260093e9f
+ F src/build.c 6c3a8a9b21402a6be98126f7d86b76527e68ca67
  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 813be7b5659d7658c8a71b5ae194b45c8f739c8b
- F src/expr.c 6814e926d92b8e99ed422193341b89f5cb8d0f87
+ F src/delete.c 5b4835982c31f12b256dc4d814363a11e7ef34cf
 -F src/expr.c af2c72f8938413c0c367554962b0d8761121f39d
++F src/expr.c 3783aa19150be01a2ae92e1eb429c84a2313c8fc
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 3ce33dd49f12c72376cec9adc7a4d8e7111cedcc
+ F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
  F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
@@@ -337,7 -337,7 +337,7 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 3f588e05027cdb1a0b27ed305038d1449657b31d
 -F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
++F src/select.c bb99c37242673405683992085a0fcff380b70575
  F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
  F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@@ -396,15 -396,15 +396,15 @@@ F src/threads.c 6bbcc9fe50c917864d48287
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
  F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c adc8b4b2b6fd2cca2e0d2b803e0cf6956aa3a030
+ F src/update.c 795fba8ebadeb194285b0a73a07f7ad5ae4d0410
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
+ F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
 +F src/vdbe.c 9d85fa72a73f7f07789d76602f724be63e998ddc
- F src/vdbe.h 529bb4a7bedcd28dccba5abb3927e3c5cb70a832
++F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 +F src/vdbeInt.h 7258d75fc2dad0bccdef14d7d8d2fd50fd1bf2d2
  F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
- F src/vdbeaux.c 2262c5a674a30279f666061dd6b86f147df0d4b5
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
++F src/vdbeaux.c 7dccd114c9ee5f801709daecee36464fe6ce71af
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
@@@ -414,9 -414,9 +414,9 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 5efdfbfade7392dbe0849b41af3550bc5de0a923
 -F src/where.c f0e08e4f1f66ba1a0f5b70c5161cb031ce1fb858
++F src/where.c 6055bee2f4aff2934ea1965c25c4d1f6368dc0eb
  F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
- F src/wherecode.c a9b88cb2973947a11ca80d04f2db30d46f8d6853
 -F src/wherecode.c c0d9b1c7c7c827998016809851d2ddc529de0fee
++F src/wherecode.c 93fa794fcd1aba23454cc15bca2b617bca21ec0a
  F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1381,7 -1380,7 +1381,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 b9927c876c1d4e146cb6a603d82cd2489594084d 1da60c3dda4254620052a83c853c2d2b6dd5009f
- R 3e1b1bd77195e09164f187ec59686181
 -P d7f4bdf594e93c848f46901637861c8eed4c34df
 -R 87d27a58ce6d4a6cd03f169f2370f2fe
++P 29570a604806e2a60a8eef7eaf1dce022d2a7004 847387ec8e6fef283899578fb232b2c23b00ee5b
++R af53d4591486f700f0b5e9bcc7196ecf
  U drh
- Z 804082d677813b1dfe48fd23d37aae84
 -Z bdbaccc5e83ea81c60c1b2c883af5b3e
++Z 6458a4b1081b59ccab00b014bcb486e3

diff --cc manifest.uuid
index 935322d5f896956185537d4b9cba912edb5c7002,3428834616b9d6af58a4775744166c3ed538397d..73014e7f1200534bee484bff02c75b1d476beb19
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 29570a604806e2a60a8eef7eaf1dce022d2a7004
 -847387ec8e6fef283899578fb232b2c23b00ee5b
++25ee3000e94d60d8c1d7b980f416dcc33eb11105

diff --cc src/btree.c
Simple merge

diff --cc src/expr.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/where.c
Simple merge

diff --cc src/wherecode.c
Simple merge