Merge latest trunk changes into this branch.

FossilOrigin-Name: 2d0c458e013cb2d02fbeabed8dabd66f55141aac194611f0e599b3c95af1964f

diff --cc manifest
index 38a861353e5f13821be964400391ae3b3db246f2,face18583a9d3a0488a50566b4185971940f1d58..a544938625b68d13c68f18ba004333c1359768a1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Add\sheader\scomment\sfor\ssqlite3_vtab_collation().
- D 2017-04-15T14:30:01.495
 -C In\sthe\sskip-ahead-distinct\soptimization,\sfix\sa\sbug\sin\sthe\slogic\sthat\sdetermines\nwhen\sto\sinvoke\sthe\soptimization\sbased\son\ssqlite_stat1\sstatistics.
 -D 2017-04-15T11:53:47.342
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2017-04-15T15:47:19.800
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
+ F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
  F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
  F VERSION 0a0e02e16b44ea735b40118fc844311b2ab0d35b25fbeda5120aee62f973f663
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -407,12 -401,12 +407,12 @@@ F src/printf.c 8757834f1b54dae512fb25eb
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c e6f9afd8a5ef35bd186e51a6bea6d3d46bc93a530f26a21fe8a0a43dbeca9415
+ F src/select.c 4588dcfb0fa430012247a209ba08e17904dd32ec7690e9cb6c85e0ef012b0518
  F src/shell.c 70f4957b988572315e97c56941fdc81fd35907fee36b7b2e7be5ec4c7e9d065d
 -F src/sqlite.h.in 40233103e3e4e10f8a63523498d0259d232e42aba478e2d3fb914799185aced6
 +F src/sqlite.h.in 18b4f1367bb80c07a6883c75c18267de2b977960adf1f30c783a731691eae3b0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
 -F src/sqliteInt.h 9affb53bb405dcea1d86e85198ebaf6232a684cc2b2af6b3c181869f1c8f3e93
 +F src/sqliteInt.h bd00872a45aa8eaa262301436bb63dc0afa685ceab7361790b065d5802269650
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -488,8 -482,8 +488,8 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
  F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
  F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
- F src/where.c 4b0d7b6696f2de64b3bdd2bc600f51ef6cd832fe269f2c0ad330974885c30652
- F src/whereInt.h 7a21ef633e26acbf46df04add2eba6e0a2100c78dc5879049e93f981fc3344df
 -F src/where.c 10ae856aa4bcf7c6be39b6b53422fc94e713ab8a19383b4cf525bc05ae70d872
++F src/where.c d22a2ae7f823f5405e5d00c3397204ce1272d53bc3f2fc0c516315f143eb1a24
+ F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
  F src/wherecode.c 943e32e9dccd0af802e0683ae11071c8bd808364e5908a5fb66758bd404c8681
  F src/whereexpr.c e913aaa7b73ffcce66abcea5f197e2c538d48b5df78d0b7bba8ff4d73cc2e745
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -1578,7 -1572,8 +1579,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0cd75a872c89958a7f418720a0e8c6f638f8284c488f666015c19136feae6be8
- R c9114bbd4adb78d55a86a8431d68fb8b
 -P d78355c85f49e139f1ac1a660563865350f0e442652b7bc50b684398f81cc602 e50fd48969f99bc988389c53ff46714603b1d11de12c71b55c00cbee037f073c
 -R a0fc0755acaae22ae06336777dc36757
 -T +closed e50fd48969f99bc988389c53ff46714603b1d11de12c71b55c00cbee037f073c
 -U drh
 -Z 7aacb0cf945619cb618007e65cb171f4
++P d238694ca445ccb4eeb3e3269a5f872f998f795945d0f9dd95c11d0e42d4d538 89f9e4363aa19f306e55f749c442eae2f8994f6a47c65e645a79b308b450d5e5
++R ee849516fe355a9533f6086faf663944
 +U dan
- Z d3545883deff75eff19284d6064a11b5
++Z 67dd241955788961a5e3c1b5613b9072

diff --cc manifest.uuid
index 409e30cf7387445a56c5d521134902d9c34ae7dc,2536b3c64ebaef9fac473fc2545cfb86be661d92..69d4418f083c2007c9a2aa9eff1e8748bcb7bea6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d238694ca445ccb4eeb3e3269a5f872f998f795945d0f9dd95c11d0e42d4d538
 -89f9e4363aa19f306e55f749c442eae2f8994f6a47c65e645a79b308b450d5e5
++2d0c458e013cb2d02fbeabed8dabd66f55141aac194611f0e599b3c95af1964f

diff --cc src/where.c
Simple merge