Update this branch with latest trunk changes.

FossilOrigin-Name: 0f66a093935100efd731e14aa63b57360ddd517c1ac97edd1ea9a9de95e1f3cc

diff --cc manifest
index dd5849b713d3d1a9b838d78748eb8d933d6e8740,24cef3a8e43a24fef1ecd21244b52f49b3dffc61..93467dde3cadbc236c424e555a3404372d7a5c3c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sformatting\sissue\sin\sthe\soutput\sof\sthe\ssqlite3_expert\sprogram.
- D 2017-04-11T18:29:14.206
 -C Smaller\sand\sfaster\simplementation\sof\sexprMightBeIndexed().
 -D 2017-04-11T18:06:48.387
++C Update\sthis\s\sbranch\swith\slatest\strunk\schanges.
++D 2017-04-11T19:00:30.300
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@@ -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 afcf31d8ed7c890328a31d3f350467ccd273af345b24562382b398d6d9cd0664
+ F src/select.c e6f9afd8a5ef35bd186e51a6bea6d3d46bc93a530f26a21fe8a0a43dbeca9415
  F src/shell.c 70f4957b988572315e97c56941fdc81fd35907fee36b7b2e7be5ec4c7e9d065d
- F src/sqlite.h.in 8ed51474c7a9edacbf328e2a6ce63de5cde8f50793c6063cb508f9de128e5a4c
 -F src/sqlite.h.in 40233103e3e4e10f8a63523498d0259d232e42aba478e2d3fb914799185aced6
++F src/sqlite.h.in cf20591fa0eb09e435db647ab28b61159262cbebac69ddad3c8c01accfb6c856
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 36eec0868d25b50e64a05bc7355557a0aa9bd14330c16b7d7568520b2bf2bb4e
 -F src/sqliteInt.h 9affb53bb405dcea1d86e85198ebaf6232a684cc2b2af6b3c181869f1c8f3e93
++F src/sqliteInt.h 5bcafb7c36f7f8765ed1e7031b7eb5f5e84cfdfe5ea4b3af01178528bde259c8
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -488,10 -482,10 +488,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
  F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
  F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
- F src/where.c 613b1cac781b2725bb0a841d5c264ae9475380ee3063c3ce9c81814b03a83c20
- F src/whereInt.h 2d50c2b74a33be44cb68fdecee30b4d93552f1f4
- F src/wherecode.c 677e95413c472c0b413023b6b69a47f40fce1b04
- F src/whereexpr.c 130cdd1a43af71b19755270fb1224874cf55158c
 -F src/where.c 1d14e18f32231fa7969e718e7b60ef749b0065e2a7e1b6b00883b20732d280f1
++F src/where.c f5acfb6fbac65e7da7b0e718fa6c6e784dee37eb29dad6efd42880ca117e7277
+ F src/whereInt.h 7a21ef633e26acbf46df04add2eba6e0a2100c78dc5879049e93f981fc3344df
+ F src/wherecode.c 943e32e9dccd0af802e0683ae11071c8bd808364e5908a5fb66758bd404c8681
+ F src/whereexpr.c e913aaa7b73ffcce66abcea5f197e2c538d48b5df78d0b7bba8ff4d73cc2e745
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@@ -1577,7 -1571,7 +1578,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 0c45c5eb9f0f171b8d7c5f0d2973f9f59915467506cdff1450f3e4b2134a01ca
- R 33f15deae23049b95df8ad5185895aff
 -P 4143650c4ce32289d2301cdfc69bb10877246420f656bed122886f6803fc956a
 -R 1aa45dcbe6873a793fc57d44af855002
 -U drh
 -Z c24847878c6bf2e9fe8bedbea41e582e
++P cc8c3581060ffef02290b680183e6f6bc9837ba3550e74c8aaabdc7c45edc223 76cd611d41465fcec61c21520d55172cb236530f38386b7d4a5544ba87de2353
++R 598dc6bf3b8d38f8068b443f6c7f3624
 +U dan
- Z 2806083003fa51636f951574e2a01b7d
++Z 7c38a019370c850a76053a951a01d320

diff --cc manifest.uuid
index 70191b5b9747b7fd6626036e79fea6d3784db4fc,a6b9476e65c123ee8a4d2ec59d92a9bc870d101c..a77280eebce4fd449446ca631a16750672e5d83e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cc8c3581060ffef02290b680183e6f6bc9837ba3550e74c8aaabdc7c45edc223
 -76cd611d41465fcec61c21520d55172cb236530f38386b7d4a5544ba87de2353
++0f66a093935100efd731e14aa63b57360ddd517c1ac97edd1ea9a9de95e1f3cc

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/where.c
Simple merge