Merge all recent trunk enhancements.

FossilOrigin-Name: 1d23294d88b1a80fe1f5403ea4fd75e61bb4932d5b714ea450d1b4b84f0896ab

diff --cc manifest
index 55a2a069f652c5af44a7b9243dd92d63bf525277,c02c59b0d055292a64f36befc800c0700014c131..030e20b8b7ecfe082e50cccc954ba8bab9f6862c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Add\stest\scode\sfor\sLSM\sto\sthe\sext/lsm1/lsm-test\sdirectory.
- D 2017-06-01T16:13:57.519
- F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 -C Add\sthe\s--fsync\sflag\sto\skvtest,\sand\sdocument\sthe\s--nosync\sflag.
 -D 2017-06-02T23:32:17.964
++C Merge\sall\srecent\strunk\senhancements.
++D 2017-06-02T23:44:38.002
+ F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 28fc4ee02333996d31b3602b39eeb8e609a89ce4
- F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
+ F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
+ F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
+ F VERSION 87f1498f27e398bce3da2fa8125c9879a38ed9d87e4b5fb922b351de1e25cadb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -28,15 -28,15 +28,15 @@@ F autoconf/tea/win/makefile.vc f89d0184
  F autoconf/tea/win/nmakehlp.c 247538ad8e8c508f33c03ec1fbd67d3a07ef6291
  F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
- F config.h.in 42b71ad3fe21c9e88fa59e8458ca1a6bc72eb0c0
+ F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 0339a635cd2943a3b56000a10a11b4b2e6ed6d1b x
- F configure.ac a2224b1162f79848982d3618ac1deffcd94e88ec
+ F configure 1bcc61cdd063171d8945551c265e5701a770deeff77e0ad634f8d22e4e91c831 x
+ F configure.ac 13f45f02e6c51dd0e347315b5401c3f047712b7f79b7f35619115c23755afcff
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
- F doc/lemon.html c30255bea0fd87a81f082d17a72c9dffbc3f6dd9
+ F doc/lemon.html 1f8b8d4c9f5cfe40e679fee279cc9eb2da8e6eb74ad406028538d7864cc4b6cb
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
  F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
- F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
 -F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd
++F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd w ext/README.txt
  F ext/async/README.txt e12275968f6fde133a80e04387d0e839b0c51f91
  F ext/async/sqlite3async.c 0f3070cc3f5ede78f2b9361fb3b629ce200d7d74
  F ext/async/sqlite3async.h f489b080af7e72aec0e1ee6f1d98ab6cf2e4dcef
@@@ -198,69 -206,41 +206,81 @@@ F ext/fts5/tool/loadfts5.tcl 95b03429ee
  F ext/fts5/tool/mkfts5c.tcl d1c2a9ab8e0ec690a52316f33dd9b1d379942f45
  F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
  F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
- F ext/icu/icu.c b2732aef0b076e4276d9b39b5a33cec7a05e1413
+ F ext/icu/icu.c 84900472a088a3a172c6c079f58a1d3a1952c332
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
- F ext/misc/amatch.c a1a8f66c29d40bd71b075546ddeddb477b17a2bb
 +F ext/lsm1/Makefile e10dbcffacc9288704c270b1f74c0811c3ef1b9b526036797d13aadddc9caa59
 +F ext/lsm1/lsm-test/README 87ea529d2abe615e856d4714bfe8bb185e6c2771b8612aa6298588b7b43e6f86
 +F ext/lsm1/lsm-test/lsmtest.h e7057a3f9db71938496fc8ef081c9f45623b25bfd8499b3550d1ea7123143e90
 +F ext/lsm1/lsm-test/lsmtest1.c 27c3cf6512514b25a145154ae4e54d053d883b2f7f52ed214747b5ebaceedd3e
 +F ext/lsm1/lsm-test/lsmtest2.c 02bd747ead150c6b0cdfeeb1637cabe21f977ab21265762036b04e76202f4fc0
 +F ext/lsm1/lsm-test/lsmtest3.c 9ab87528a36dbf4a61d7c8ad954f5ee368c0878c127b84b942b2e2abe522de26
 +F ext/lsm1/lsm-test/lsmtest4.c d258d6a245db5d8eaede096e2368d23f859c5e92c80ab9122463f708514fe10c
 +F ext/lsm1/lsm-test/lsmtest5.c 8d5242a0f870d65eeada191c8945781fed9cb8ece3886573790ebd373b62dac5
 +F ext/lsm1/lsm-test/lsmtest6.c 9d5db9ff638152c8c3948dc1077dd302deff4fcb3d30cc71ac769915797bbb1d
 +F ext/lsm1/lsm-test/lsmtest7.c aece33086e531898ecbf218d51c0be7a0d6c461219268f1a8e89ab0e8bf64654
 +F ext/lsm1/lsm-test/lsmtest8.c b87a1279b0cfbb39df1fff50074696fbf5d83822349f65706fab6d618a7a52fa
 +F ext/lsm1/lsm-test/lsmtest9.c 88245ce0fdd01678be548100e584cacdacab90208624223aac9029e4f90535fe
 +F ext/lsm1/lsm-test/lsmtest_bt.c d70d9a9be5eef9360af1251dd083948d74fd30137a08f61bef995f7ac04e037f
 +F ext/lsm1/lsm-test/lsmtest_datasource.c 5d770be191d0ca51315926723009b2c25c0b4b8136840494ef710ac324aa916c
 +F ext/lsm1/lsm-test/lsmtest_func.c 159aa401bc8032bfa3d8cf2977bd687abebab880255895a5eb45770d626fa38d
 +F ext/lsm1/lsm-test/lsmtest_io.c 2b71d1208a5671b3836fb95cdb4c0263ae7eb51542d16ef7f6bb9b651b15f194
 +F ext/lsm1/lsm-test/lsmtest_main.c db1d641afd8ba4ca8c6f37b388054ac981f8ba934411e754fe175058f417d372
 +F ext/lsm1/lsm-test/lsmtest_mem.c 996b1e76cc876e8d765182a2f14159b1acbf56cbf86d286173e13e970b79a945
 +F ext/lsm1/lsm-test/lsmtest_tdb.c f40971180a55013e75760995b0716ac4540450466bf329201767aba04f5467c1
 +F ext/lsm1/lsm-test/lsmtest_tdb.h de1ee8c71a7ef61d964e40e057cffea387d7b58a51d95905ab909937d24e4a91
 +F ext/lsm1/lsm-test/lsmtest_tdb2.cc 99ea7f2dd9c7536c8fb9bdd329e4cfeb76899f3ddf6f48bdd3926e016922b715
 +F ext/lsm1/lsm-test/lsmtest_tdb3.c c55afd81231094ee0fd5b83dca6cff5540ba044e571b5f34bf25cedb26ff8d0e
 +F ext/lsm1/lsm-test/lsmtest_tdb4.c 47e8bb5eba266472d690fb8264f1855ebdba0ae5a0e541e35fcda61ebf1d277f
 +F ext/lsm1/lsm-test/lsmtest_util.c 0c2b7c1d109fbd6b7b9a2780f1315e2438a973d18afea5c4eccf94e8827c8260
 +F ext/lsm1/lsm.h 0f6f64ff071471cb87bf98beb8386566f30ea001
 +F ext/lsm1/lsmInt.h bc270dd81b3355c7410b06a6d54dd3eb9493a3e8
 +F ext/lsm1/lsm_ckpt.c e7907e782fe2e95de0833675e35e726e487cc4cd
 +F ext/lsm1/lsm_file.c 63796f5741422064b146cfbffbaeaeda14b70175
 +F ext/lsm1/lsm_log.c 5b3e855fcfb85de9fb86fcbf65696cc6886d3231
 +F ext/lsm1/lsm_main.c f52eada2910f8a57bd4cafcee39c6c375f6b7ed8
 +F ext/lsm1/lsm_mem.c 4c51ea9fa285ee6e35301b33491642d071740a0a
 +F ext/lsm1/lsm_mutex.c 378edf0a2b142b4f7640ee982df06d50b98788ea
 +F ext/lsm1/lsm_shared.c 54cc3a5157c6abd77f7d3ae60708b9f7bf022b3c
 +F ext/lsm1/lsm_sorted.c 4a9e3ffecda87b379ed757b59c9cbcd84a80b55c
 +F ext/lsm1/lsm_str.c 77ebdd5040ddf267a6f724d4c83132d2dce8a226
 +F ext/lsm1/lsm_tree.c 5d9fb2bc58a1a70c75126bd8d7198f7b627e165b
 +F ext/lsm1/lsm_unix.c ff6d0a89861c90193f21e35ea5dfea389b480e46085c1d7ff931833b77c3ff30
 +F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41
 +F ext/lsm1/lsm_vtab.c fff303ce03168eca9e333add3c1429b3471674b0
 +F ext/lsm1/lsm_win32.c de84068b4df2999a9cefcf67aae19b0733203f772ca58f7e0c2b0bc87136d2e3
+ F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
+ F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
+ F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
+ F ext/misc/carray.c 40c27641010a4dc67e3690bdb7c9d36ca58b3c2d
  F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
  F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
+ F ext/misc/csv.c 531a46cbad789fca0aa9db69a0e6c8ac9e68767d
+ F ext/misc/dbdump.c 3509fa6b8932d04e932d6b6b827b6a82ca362781b8e8f3c77336f416793e215e
  F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
  F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
- F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767
+ F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
  F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
- F ext/misc/json1.c b9c88d5c3b6ecd8c731ffdd7f5b3d902857f8c96
+ F ext/misc/json1.c dbe086615b9546c156bf32b9378fc09383b58bd17513b866cfd24c1e15281984
+ F ext/misc/memvfs.c e5225bc22e79dde6b28380f3a068ddf600683a33
  F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
- F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
- F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
+ F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
+ F ext/misc/regexp.c a68d25c659bd2d893cd1215667bbf75ecb9dc7d4
+ F ext/misc/remember.c 8440f8d0b452c5cdefb62b57135ccd1267aa729d
  F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
- F ext/misc/series.c b8fb7befd85b3a9b4a10e701b30b2b79ca92b6d4
+ F ext/misc/scrub.c 1c5bfb8b0cd18b602fcb55755e84abf0023ac2fb
+ F ext/misc/series.c b0f5f346aca9b7ff7caaf0da2efb4ad462441abd4dcd92a460cb573b3ea2370b
+ F ext/misc/sha1.c 0b9e9b855354910d3ca467bf39099d570e73db56
+ F ext/misc/shathree.c fa185d7aee0ad0aca5e091b4a2db7baff11796170e5793b5de99e511a13af448
  F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
- F ext/misc/spellfix.c 525190484b7a9dbc6be646c4842274fff4f27d53
+ F ext/misc/spellfix.c a4723b6aff748a417b5091b68a46443265c40f0d
+ F ext/misc/stmts.c 4aa554f671f6a55a52060437a0215a93d2e9f10f2fa66b0f7f65aa0576fc90bb
  F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
  F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
- F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
+ F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
+ F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
  F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
- F ext/rbu/rbu.c ba3983dceffa0938532e79142f391737513de023
- F ext/rbu/rbu1.test 57601977588603e82700a43c279bd55282ffa482
+ F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e
+ F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842
  F ext/rbu/rbu10.test 046b0980041d30700464a800bbf6733ed2df515d
  F ext/rbu/rbu11.test 9bc68c2d3dbeb1720153626e3bd0466dcc017702
  F ext/rbu/rbu12.test bde22ed0004dd5d1888c72a84ae407e574aeae16
@@@ -1467,9 -1559,30 +1599,30 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
+ F tool/warnings.sh 8a4acea31e0f9c562949a2d767329533c0930d699ea19c6704c0ca0aa9154068
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P f92dc4187f6046fcb3ab63449efd7f3738594adc
- R 74f8632bb5f7bfdb807bffd1f01db75d
- U dan
- Z 765d188223533ed5b1d4be9ec2f35903
+ F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
+ F vsixtest/App.xaml.cpp c465147f50871165c60ca16955219f6c5812d6d8
+ F vsixtest/App.xaml.h 4a9768e2983d05600ad1e1c2f1b00a132967da9f
+ F vsixtest/Assets/LockScreenLogo.scale-200.png e820c9a3deb909197081b0bf3216c06e13905f0a
+ F vsixtest/Assets/SplashScreen.scale-200.png cab70988ca71bebec7bfeb3b6dbafe17b9ab0b4a
+ F vsixtest/Assets/Square150x150Logo.scale-200.png e17b40817db7a239fc239d83efcc951fb824e3ff
+ F vsixtest/Assets/Square44x44Logo.scale-200.png 2f166237094dea94d952d10b9eeae81806844f1c
+ F vsixtest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png 5f6a6d391b95a3061ccca6e6fdd6955ede63b4ed
+ F vsixtest/Assets/StoreLogo.png 0828b7257db74a4ecd5eeb6b7b4971f0fdc4d9d1
+ F vsixtest/Assets/Wide310x150Logo.scale-200.png 04ddefe5bc5f43ae12a7433f6f236ddab101ac42
+ F vsixtest/MainPage.xaml 34f49897e3ca533a7e74506ba0759b66eebce151
+ F vsixtest/MainPage.xaml.cpp 7f31fc6de751b64676c0924c97a5485d950a91d7
+ F vsixtest/MainPage.xaml.h cc05cca10d50a003f6c6e4448b701cdd07f52f29
+ F vsixtest/Package.appxmanifest 6b6db1eb7df3a315c5d681059754d5f0e0c47a93
+ F vsixtest/pch.cpp cb823cfac36f1a39a7eb0acbd7e9a0b0de8f23af
+ F vsixtest/pch.h 9cab7980f2ac4baa40807d8b5e52af32a21cf78c
+ F vsixtest/vsixtest.sln 77cadbe4e96c1fe1bf51cd77de9e9b0a12ada547
+ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
+ F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
+ F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
+ F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
 -P fc73e7d2f16386f96c55c42f9830193f7c178521a7ad90c3117b85ef629b5ce4
 -R ac814c325af013850c7ab30877776723
++P bb7436e84a315baf05f00e6cab396017e3f287ea404d32e0cc4f389fa1194dec 7fdc78a672b2ea6187dcb5fdf32f809bb8e4d501e2434f2233edc3bc2e3acc7c
++R 11927608ecdd6b30addc96e2d45b60e0
+ U drh
 -Z 8a788cf2631896aff995d8f1a4f42a59
++Z 97351d774b2992c84ce6aa543caabe27

diff --cc manifest.uuid
index 058e6d29b97a63f14abf3b4d986dc8b0e780d0ed,87e068908596da989b768c7c8b9068c42c48fef7..f487bf92335b82a1cc12a4d7d82ec95e4ff42463
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bb7436e84a315baf05f00e6cab396017e3f287ea404d32e0cc4f389fa1194dec
 -7fdc78a672b2ea6187dcb5fdf32f809bb8e4d501e2434f2233edc3bc2e3acc7c
++1d23294d88b1a80fe1f5403ea4fd75e61bb4932d5b714ea450d1b4b84f0896ab