Merge trunk enhancements.

FossilOrigin-Name: e8b02902c48f3668dcff7b1767347ac7ef3c971e

diff --cc manifest
index b9e43c21d7469944a8e842052b2cc858efa7ac84,98a1fd3f66047b6be9946ee180d2c4ac691005a1..d722cc52e5d842a9011a8d2393eef1925a554330
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\scode\sto\smaintain\sindexes\swith\sexpression\sarguments\sacross\sDELETE,\sINSERT,\nand\sUPDATE\sstatements.\s\sLegacy\stests\spass,\sbut\sthe\snew\scode\spaths\sare\sstill\nlargely\suntested.\s\sThe\squery\splanner\scurrently\smakes\sno\seffort\sto\suse\nexpression\sindexes.
- D 2015-08-25T16:57:52.554
 -C Use\sthe\ssqlite3IndexColumnAffinity()\sroutine\sto\squickly\sand\scorrectly\sfind\sthe\naffinity\sof\san\sindex\scolumn.
 -D 2015-08-25T19:20:04.670
++C Merge\strunk\senhancements.
++D 2015-08-25T19:24:11.597
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -288,16 -288,16 +288,16 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
- F src/delete.c 07ba8cc1def3ed9a316c0073217c48ebff59062b
 -F src/delete.c 813be7b5659d7658c8a71b5ae194b45c8f739c8b
 -F src/expr.c 650ac7c4f659980a3315e2aaa02a0d71e87f14a5
++F src/delete.c 224e5c9a0eae7fbdd3b461ca971465c992851354
 +F src/expr.c 4a52fd29145d94c6f2e355ec67489dc8d309f05e
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
+ F src/fkey.c 3ce33dd49f12c72376cec9adc7a4d8e7111cedcc
  F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 602809df9668a8418ea488a59a0bef787f0aec6f
 -F src/insert.c 0edf54c489f5752194b9263cb0a78c247cc4e580
++F src/insert.c a836e16cf9649bb48aa39ac484574a406d6d5034
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
@@@ -342,7 -342,7 +342,7 @@@ F src/shell.c 5a08835e85c502978bde35a89
  F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h 5fe814323e6ea95685206f8764db29dba680c8e8
 -F src/sqliteInt.h fdf60b248e260a4189e6d37a3dfd3500b6bbe629
++F src/sqliteInt.h fd8c4823f478debee332db40222ea76c352eee37
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -396,7 -396,7 +396,7 @@@ F src/threads.c 6bbcc9fe50c917864d48287
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
  F src/treeview.c c15df00728034549ff92d78ae851b44952736d3b
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c 798196d7693277d359846df7587fc15ee58a563f
 -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 -1379,7 +1379,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 0ad0f8d77d8f95ca2ffb7745d18219f5e87dc89c
- R 457a1c92538887efc6aebf70344c3622
 -P 8f1d9f1f308518522ebb1eaebb9b184b4ac30924
 -R 9f42504abba31a08ea4c89fa9c98aeeb
++P efaabdb71626bdc03768e87e186c72f6f3da75b2 1ee089a72d789002a0a377347fc51e08ab32fb14
++R 58e78bc0b300bf502ebd9a4f7f9bb701
  U drh
- Z d2f3b8f04887de8a5bca7c4f4441bcbc
 -Z 95c550a2c6ae0fd191dda0e3160d77d8
++Z f8380f2d492a690cb53251fd6fe38f86

diff --cc manifest.uuid
index a43b7e84eadf4452b985a39655dfa5645bc0a839,757ef27e966dc13c30f02453f2f3d5fbd1dcf5f9..3d2985a21164af79560ae108a29b5d6d045bd5e8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- efaabdb71626bdc03768e87e186c72f6f3da75b2
 -1ee089a72d789002a0a377347fc51e08ab32fb14
++e8b02902c48f3668dcff7b1767347ac7ef3c971e

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge