Merge updates from trunk.

FossilOrigin-Name: a447cf90ddfd2930274f58de4bae3b07f2886632

diff --cc manifest
index 888bcdfd1ba5d0fcfb27a27d2313c2613a9d928e,292c4843e0aa14fa282bc3bc70efc30cd0d292cd..2cf3bea15eb8e6a14101899963838ac18d580bd0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,14 -1,11 +1,11 @@@
- C Correct\ssuperfluous\swhitespace\sdifference.\s\sNo\sfunctional\schanges.
- D 2015-09-23T16:33:44.728
- 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 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-10-15T21:12:27.435
+ 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,21 -302,21 +302,21 @@@ 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 cf4d6d94709fc2caf2f92066d24a0f9d125b9260
- F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
+ F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
 -F src/main.c fec97668771438033a7559883401067b139729e1
++F src/main.c 2082c1c7aa1687849848581e084f6046c503841d
+ 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
 +F src/mutex.c 40dc52f7525fa86f35dff2a7c9b6e6870240952a
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
 -F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
 -F src/mutex_unix.c a94b46f3f7beba307dde1b298b0f99f9c3677a93
 -F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
 +F src/mutex_noop.c f03e26ba8258399da23b51234f6b6a97197c1900
- F src/mutex_unix.c a72043f2560147d8e85fe48a6aef682896deb3a0
- F src/mutex_w32.c 928c889408e3196f325d23fa4d115b3bc59d8eb6
++F src/mutex_unix.c 77d84839735aec71f9fe731bfd845d81cec2bb65
++F src/mutex_w32.c c3a5049bc413dd8321480b28f275fbf2b99c846e
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
  F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
@@@ -340,17 -338,17 +338,17 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
- F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in 4e06cb5fed36736242c66237991db6f3e2395eb9
+ F src/select.c dbf1fb82317043304da334a33206add211487f96
+ F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
+ F src/sqlite.h.in 839c818e16ea68703d90d17bd2bb3607191debce
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
- F src/sqliteInt.h 2e5280bf7e66b68ebb8df46877dd745c3e8436af
+ F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
 -F src/sqliteInt.h 1ad779ee62efee60494af0a75d8d45592f9f53c3
++F src/sqliteInt.h 2d82464793c7d07b01dfcdc43942a27063ea398d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
+ F src/status.c 286f6398a4d2cd1e8ff0771e3d30f8dddb4768ea
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c c96508c835979bf15dc0e3146e2c7a51a2333d3c
+ F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -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 da0587c522163833e5e542f7722aeb69b3183ac1
- R 2c38e4ff296b8522f87a2833b62fffb5
 -P 3a2f73a4924860fde8ee41ad646e7a02d29ad9d5
 -R 16722b48de28ae59c1a22e712b62a0b0
 -U drh
 -Z fcd4e595e3a40ac192e62fadc88a95a3
++P 8d69983dc2b94ca752259dcec360c32d60a8e9dd 871e091df651b2275a672c35ff938bd4b6db0d7f
++R 2967669474e0bc8a932a9ea55508690e
 +U mistachkin
- Z a6e6c550c142804be7b43775f66fc2a0
++Z 30c10e55f7847c468e81b5b9567db928

diff --cc manifest.uuid
index 0ed3bac558d03b181ab52fe918aacc64002ab9de,fce1857f4dd3f15ec2ddff486c54582d4b2096f8..cf2ff39cc442bfb5a0c3cee1e837378a9cbcaae5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8d69983dc2b94ca752259dcec360c32d60a8e9dd
 -871e091df651b2275a672c35ff938bd4b6db0d7f
++a447cf90ddfd2930274f58de4bae3b07f2886632

diff --cc src/main.c
Simple merge

diff --cc src/mutex_unix.c
Simple merge

diff --cc src/mutex_w32.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge