Merge latest trunk changes into this branch.

FossilOrigin-Name: d00b71ecf857bc6d903442d91418d5a313c584dcdd8e9c8ff3b5d940dd45bcc5

diff --cc manifest
index be3c194627bb28a0758327a2c18f11cc8f50ad1a,c8b5d5545e04119d8d17e203863c6c32b804496d..d99a2e460a62340994e7af3ac6b66adcbce0d268
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\ssome\sdocumentation\sand\sother\sissues\swith\sthe\scode\son\sthis\sbranch.
- D 2018-03-21T19:46:36.826
 -C Add\sthe\soptfuzz.c\sprogram\sfor\sverifying\sthe\squery\splanner\susing\sa\sfuzzer.\nThis\sis\san\sinitial\scode\scheck-in.
 -D 2018-03-21T19:25:59.092
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2018-03-21T20:13:56.529
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@@ -1111,6 -1110,9 +1111,9 @@@ F test/numcast.test 5d126f7f581432e86a9
  F test/numindex1.test 20a5450d4b056e48cd5db30e659f13347a099823
  F test/offset1.test f06b83657bcf26f9ce805e67450e189e282143b2
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
 -F test/optfuzz-db01.c a0c256905c8ac79f9a5de2f374a3d9f757bef0dca2a238dc7c10cc8a38031834 w test/testdb01.c
 -F test/optfuzz-db01.txt 21f6bdeadc701cf11528276e2a55c70bfcb846ba42df327f979bd9e7b6ce7041 w test/testdb01.txt
++F test/optfuzz-db01.c a0c256905c8ac79f9a5de2f374a3d9f757bef0dca2a238dc7c10cc8a38031834
++F test/optfuzz-db01.txt 21f6bdeadc701cf11528276e2a55c70bfcb846ba42df327f979bd9e7b6ce7041
+ F test/optfuzz.c b5f8c4d1af09e98592331d8598d58d7088bdad085703a37cf6b3a12f3b1a3ae8
  F test/orderby1.test 4d22a7c75f6a83fc1f188cc7bb5192285fdf2552
  F test/orderby2.test bc11009f7cd99d96b1b11e57b199b00633eb5b04
  F test/orderby3.test 8619d06a3debdcd80a27c0fdea5c40b468854b99
@@@ -1713,7 -1715,7 +1716,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 d8bc3fdb6ba165ca8d7cab857ede8e7e6e2fac24ad59580c5e1db1a4942d295c
- R 9dca9b6b419ea7dcdd6c7349b961b063
 -P 4661ac81c9589b06a07df8b7931fbd0a7f9a4e9ba1448192b70701dc85a29bd2
 -R 4dcfbf1bcde15e35f7fd5f585699a49d
 -U drh
 -Z af967147daedd09b6c6ab5f21381279c
++P a9ec68627a4533ca6aa7cc1b73f864db615a80e86eda9e33660f22d269a1ba1e 3fb21251b0c9c731513e8fb137867c2710a77d99411c99348d3ac45d3babffd7
++R 3c085a679a5c6bacbd79a8bf650ad04f
 +U dan
- Z 2bd9e2b5f750bb24220e9fd7d7a0ebe6
++Z de87c26f5f363c23e40146da082bca9e

diff --cc manifest.uuid
index 49df6fbc3f193b61a0980c1a8a02873ed2184e39,455d723d9b775b1f20844b9a800c49187eeaee69..84f49f10d18eb4b975a9dfa617a1a7c5df930f55
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a9ec68627a4533ca6aa7cc1b73f864db615a80e86eda9e33660f22d269a1ba1e
 -3fb21251b0c9c731513e8fb137867c2710a77d99411c99348d3ac45d3babffd7
++d00b71ecf857bc6d903442d91418d5a313c584dcdd8e9c8ff3b5d940dd45bcc5