Merge updates from trunk.

FossilOrigin-Name: e05f743f619a6b60d0782ee85c73f6866696962954d7cb3eceb03af79c6a6189

diff --cc manifest
index 3cb4d4a72419193644d1f9743090e5efcb110130,06cd979aa0fd48184ebac9447043db90af2bdd1a..676c249f8061353a013b790a7bb9e4090fa73728
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Background\swork\sfor\sexperiments\strying\sto\senhance\sANALYZE\sso\sthat\sit\sruns\noff\sof\ssamples\sof\sthe\sentire\sindex\sand\sdoes\snot\sneed\sto\sread\sthe\sentire\nindex.
- D 2020-03-10T01:24:13.546
 -C Enhanced\sdetection\slogic\sfor\spreventing\sthe\suse\sof\sstatic\sschema\sexpressions\nby\scode\sgenerating\sroutines.
 -D 2020-03-10T19:24:38.960
++C Merge\supdates\sfrom\strunk.
++D 2020-03-10T22:55:51.353
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1860,10 -1860,7 +1860,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 3df07e5a9a3781a4cf866fc6ee0e5c6f9cd7ca35ce0a6eb3aa7f5f3502e0ffae
- R e35bdeff6c928526c7218be9d4bb475b
- T *branch * approximate-analyze
- T *sym-approximate-analyze *
- T -sym-trunk *
 -P f45f5de000834da5b23cdcf12c3f0e3073287756afe06bdb77b95fb65b250258
 -R f078265eb0d8f8487aa3c2a1c341660a
++P 29d1cc5c3619a88229f18c3c8131228f8a2d151ac3d9203f0c7fc538a996ecec 5f60b527b938c0778e8f725c635ce0dc5ed7a4e01fd6252aa2cdb64da2f625bc
++R 85d11a764a8467f79a2f960f315d2498
  U drh
- Z 2efa3c6a2e23594b6e9a59be6c71be4b
 -Z 1d0ba7c8bbe7247314d90dba25e45a8e
++Z bb3c80c49aabc721f930978bf9b4a8db

diff --cc manifest.uuid
index a3157116f9c60acbfa6efa4fecd1bca60b3d069f,c22469d699d1e0d7ba0da7591dd137ec3e9ec36f..cfde0a2080bb55587590e17e3978bdaa06278cb9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 29d1cc5c3619a88229f18c3c8131228f8a2d151ac3d9203f0c7fc538a996ecec
 -5f60b527b938c0778e8f725c635ce0dc5ed7a4e01fd6252aa2cdb64da2f625bc
++e05f743f619a6b60d0782ee85c73f6866696962954d7cb3eceb03af79c6a6189