Merge recent changes from trunk.

FossilOrigin-Name: f8df2a8e28acdd9573a9ffc18027553f35f769a989f5dfbf81f31b0656ee6065

diff --cc manifest
index 2cfdac9d08438e34d56439057e9332da2c47c7d9,9f8ea7f5b7654efe2a022ffcc601f8abcc5a2b3c..4662b7c5c6e3fb37e280e677637d89d784c4f5a6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Demonstration\scode\son\sa\spossible\stechnique\sfor\soptimizing\sthe\suse\sof\sIN\noperator\son\scolumns\sto\sthe\sright\sof\smulticolumn\sindexes.\s\sIf\sthe\sOP_Noop\ngenerated\swhere\swere\sreally\sa\snew\sopcode\sthat\schecked\sto\ssee\sif\sthere\sexisted\nany\sentries\sin\sthe\sindex\swith\sa\smatching\sprefix,\sit\smight\sprevent\sunnecessary\niterations\sof\sthe\sIN\soperator.
- D 2018-05-30T00:54:23.670
 -C Avoid\susing\sa\smisaligned\spointer.
 -D 2018-06-02T19:14:58.082
++C Merge\srecent\schanges\sfrom\strunk.
++D 2018-06-04T13:27:39.306
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@@ -1729,10 -1730,8 +1730,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 3b00f73456c65dfc1827fdada9afb49245f9addfa684d5ae35e69a07f39164bf
- R 150e6f6563a2a6ab67c600fc77f11cd6
- T *branch * multikey-opt-idea
- T *sym-multikey-opt-idea *
- T -sym-trunk *
 -P ce2c3e7a875ede4366c48660ae8239d2b74e5f690ad5059844a45f1164f41e61 1b807b51cdf455b4f54216b73fd22bbc90f94e24222401e045f88cfd27f487e3
 -R 2db4b8b40a57a71d528932145db72c5a
 -T +closed 1b807b51cdf455b4f54216b73fd22bbc90f94e24222401e045f88cfd27f487e3
++P 92f0fe155d5546fc7f4a443d0630613dabe149061966308e5420fad652278f16 1ecb3aa13de5c8dc611b814ff34010de0bd90aae73d88aa37a59c4627be4cc2d
++R de1a7f465f15f36752abec96be3aea43
  U drh
- Z 0e3a9a98888882656fe85b8d1be89ddd
 -Z 5a6c767d04a951cad28a5422f8a9694a
++Z fcbdf6ace3bba503012881319d44d7a3

diff --cc manifest.uuid
index 60b47eade3efd6cc332df0473052c6ee506190ac,e0a78a25f616e53fe12c820e513344a13819b421..f200fefdac9528bef9e1466794140592dd4e5163
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 92f0fe155d5546fc7f4a443d0630613dabe149061966308e5420fad652278f16
 -1ecb3aa13de5c8dc611b814ff34010de0bd90aae73d88aa37a59c4627be4cc2d
++f8df2a8e28acdd9573a9ffc18027553f35f769a989f5dfbf81f31b0656ee6065