Merge updates from trunk.

FossilOrigin-Name: 40493680083c4df94b718b4bcd15728d476a4e09

diff --cc manifest
index a044c1cae96e5e8f9a42545146d9213540238d55,292c4843e0aa14fa282bc3bc70efc30cd0d292cd..499961da89fe910b90dd90867b634ef58a04504e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,14 -1,11 +1,11 @@@
 -C Enhance\sthe\suse\sof\sthe\scolumn\scache\sfor\sUPDATE\sstatements,\smaking\sthem\nmore\sefficient\sfor\sthe\scase\swhere\sa\scolumn\sis\smodified\sto\sbe\san\sexpression\nof\sother\sunmodified\scolumns.
 -D 2015-10-15T19:21:51.254
 +C Merge\supdates\sfrom\strunk.
- D 2015-09-23T16:35:52.480
- F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
- F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
- F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
++D 2015-10-15T21:13:14.857
+ F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
+ F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
+ F Makefile.msc 8e42cb55739cd8c12e1fd25401956e2019448f6a
  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
@@@ -304,14 -302,14 +302,14 @@@ F src/insert.c 6dadbb671c2cc035ddbbf11a
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
- F src/loadext.c f0b66d28e377fd6c6d36cc9d92df1ff251ebee44
- F src/main.c dce50d88aa993f1c47b9d9591f67a292fe927b37
- F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
+ F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
 -F src/main.c fec97668771438033a7559883401067b139729e1
++F src/main.c 1a9235d74d2b39c47cc8f49957eaad03a3606d35
+ F src/malloc.c 0a2e42b835c980ba91c17866e9b6a9810ff54d75
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
+ F src/mem1.c 52485a88f22649c3b3b4f3eb15760505d49ccf71
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
- F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
- F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
+ F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
+ F src/mem5.c c1ab1153bd6443bdf6f71e4213c6fb31221b9eb7
  F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
  F src/msvc.h d9ba56c6851227ab44b3f228a35f3f5772296495
  F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
@@@ -1388,7 -1391,7 +1391,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 cf114c18953044bd50c050c662cef256fddcef9c 10a214fdb3c13b25e0bdd15c975c21c8890c47ee
- R 3d77c66da90a872536f41067a31e97d4
 -P 3a2f73a4924860fde8ee41ad646e7a02d29ad9d5
 -R 16722b48de28ae59c1a22e712b62a0b0
 -U drh
 -Z fcd4e595e3a40ac192e62fadc88a95a3
++P 0a75ebd23e3bd56d9352549bfb9f97f24e29e0cb 871e091df651b2275a672c35ff938bd4b6db0d7f
++R cc78e127a7227b3b6d8262f8b068d45d
 +U mistachkin
- Z cdaa94bce4ad170f086743df139fea2f
++Z 0cd8afcd2f8c8c2a7357ff44ae9f5ff1

diff --cc manifest.uuid
index 27bec6567893c5c71c59c1969ea61b10473efb16,fce1857f4dd3f15ec2ddff486c54582d4b2096f8..5b16ded8be0a3404217dfc139393126fa2e39b4b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0a75ebd23e3bd56d9352549bfb9f97f24e29e0cb
 -871e091df651b2275a672c35ff938bd4b6db0d7f
++40493680083c4df94b718b4bcd15728d476a4e09

diff --cc src/main.c
Simple merge