Merge enhancements from trunk.

FossilOrigin-Name: ec6ddb3d481d005c304a26c948c9c808586750e9

diff --cc manifest
index d722cc52e5d842a9011a8d2393eef1925a554330,5a48ac0a18e31568ec21ebdf2530322e311308e8..cc1cce44dfa51d97967649b4833219ce4cbdafc5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\senhancements.
- D 2015-08-25T19:24:11.597
 -C Evaluate\sexpressions\sonly\sonce\swhen\sthe\ssame\sexpression\sis\sused\sin\sboth\sthe\nresult\sset\sand\sin\sthe\sORDER\sBY\sclause.
 -D 2015-08-26T14:01:41.658
++C Merge\senhancements\sfrom\strunk.
++D 2015-08-26T18:04:23.442
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -282,14 -282,14 +282,14 @@@ F src/btmutex.c 45a968cc85afed9b5e6cf55
  F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c c249a192b2395363e9ec89ec7060312ea6a0b2ca
 -F src/build.c 97f682229876834abad515a0a48759a967999ed0
++F src/build.c 6b7f6ccacd9cbd113f1948b4268cb81a87ee513a
  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 5944e529891416f482250e16c598d8c26e149eb0
 +F src/delete.c 224e5c9a0eae7fbdd3b461ca971465c992851354
- F src/expr.c 4a52fd29145d94c6f2e355ec67489dc8d309f05e
++F src/expr.c cf0c5ef6467d3eb65e3ff5c88eb2f602ba3b5163
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 3ce33dd49f12c72376cec9adc7a4d8e7111cedcc
  F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
@@@ -297,7 -297,7 +297,7 @@@ F src/global.c 508e4087f7b41d688e4762dc
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c a836e16cf9649bb48aa39ac484574a406d6d5034
 -F src/insert.c c31b9253f0d40425d012701ba6e7e4b28c1676ea
++F src/insert.c b459da1440fd10cb839c716685701f619e3d86a5
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
@@@ -335,14 -335,14 +335,14 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c c4691acf9dca466799a0b07cf7f82d18d557f799
 -F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
++F src/resolve.c e6dc5a5490cf93afc1cc2cb58280c98da56acb3c
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c da6d1e7a4f1c8d713ed5415b5ed21d82ef465c0f
+ F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105
 -F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
 +F src/shell.c 5a08835e85c502978bde35a89d4045833f772876
  F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h fd8c4823f478debee332db40222ea76c352eee37
 -F src/sqliteInt.h cac6c31a0c7e6aa5572cc97b68d2630034d6d212
++F src/sqliteInt.h 340fc115a707838ad365b52057f126b143f6aa60
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -394,9 -394,9 +394,9 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
- F src/treeview.c c15df00728034549ff92d78ae851b44952736d3b
+ F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c adc8b4b2b6fd2cca2e0d2b803e0cf6956aa3a030
 +F src/update.c e1bea2b67d3453a4a7a49c60c48b5c1dda6d15c6
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
@@@ -1379,7 -1380,7 +1380,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 efaabdb71626bdc03768e87e186c72f6f3da75b2 1ee089a72d789002a0a377347fc51e08ab32fb14
- R 58e78bc0b300bf502ebd9a4f7f9bb701
 -P 58ba73630ecc4bc58b03a7962dd45b305ef605ef
 -R 657299463d01da646731fb6b8ab7d9fe
++P e8b02902c48f3668dcff7b1767347ac7ef3c971e c2f3bbad778504681b39ab9399a1eb3c1a35ab3f
++R 81693495b2084fce0fa08431d5ef28b1
  U drh
- Z f8380f2d492a690cb53251fd6fe38f86
 -Z 83e3936f8767c9500521d2082aa870a1
++Z bec0cbafd7b79403eeb50b2f9a3289c8

diff --cc manifest.uuid
index 3d2985a21164af79560ae108a29b5d6d045bd5e8,1045acaa9251e77ca99533452bebebe24c6b8473..c6150c8ad46cf9b9d30179b3547aa920d4434af2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e8b02902c48f3668dcff7b1767347ac7ef3c971e
 -c2f3bbad778504681b39ab9399a1eb3c1a35ab3f
++ec6ddb3d481d005c304a26c948c9c808586750e9

diff --cc src/build.c
Simple merge

diff --cc src/expr.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/resolve.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge