Merge trunk fixes into the bloom-filter branch.

FossilOrigin-Name: edacf8034dc6bd892038c220c480ea512dbb4005db2a6b1f8e679e8a4929c6ed

diff --cc manifest
index 648c9a916124c42d63f2a30e202d6f8f9d9e72c6,bd016deb39aba820d97368e1ec8fab74aa2392b9..754a38701e59b1deff8a371e4103b440d11cd747
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Attempt\sto\svary\sthe\ssize\sof\sBloom\sfilters\sbased\son\san\sestimate\sof\show\smany\nkeys\sthe\sfilter\swill\shold.
- D 2021-12-06T13:07:28.112
 -C Fix\san\sOOB\sread\sthat\scould\soccur\sin\sfts5\swhen\sprocessing\scorrupt\srecords.
 -D 2021-12-06T18:57:02.055
++C Merge\strunk\sfixes\sinto\sthe\sbloom-filter\sbranch.
++D 2021-12-06T19:11:31.036
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -514,8 -515,8 +515,8 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c e0293a6f686e18cb2c9dd0619a731518e0109d7e1f1db1932974659e7843cfd1
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c
- F src/main.c 7bd4fdc41ef53535271a1816ff043ba153cda03842b444b6e2f57b27b2cb9090
+ F src/main.c 1ea70751e6005ab6a9f784730fa0919efaa6639440a287deb73cb711e5aae57a
 -F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
 +F src/malloc.c 183c2bf45cee1589254e4047e220f1ffbcc0a3bc8e4fe46fe64ba5db447a79af
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@@ -1933,7 -1934,7 +1934,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 06f6fefd67086896bc49272c6319545ff6c6792f18babe23aced27b60b032119
- R 5f90145148ed31800619d7b25d77beb7
 -P 8fd5b8ec4ab9b5554d27f25a4638d56e347eab78b60900f24b15a815d3731330
 -R c3401645c738abc52212977ced7d66bd
 -U dan
 -Z bbca536d76f68538aaa5d06c505e1b60
++P a7adcf69088cba4b86cc5731a45c9a5263af4355bc0a38f5225cab421c915f7f bb9b1a15f7e80483162049dfd981d059dc69d03348b521f7ac164a8cd3ae3cc4
++R 0f448dc1f18098ffcb6b2fdc27d44d39
 +U drh
- Z 3013773c2d9a03770ac02d1fdd22abd3
++Z a01a7e207ad8c3ff4f1aefb648f1cc10

diff --cc manifest.uuid
index 7894b82c00ac10e261562bfa38d41f589bd6f55b,85e543009ee1cb812b9209d003d310a832b0148a..63d6d10d76e49af121f93035a3272399a44c4f40
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a7adcf69088cba4b86cc5731a45c9a5263af4355bc0a38f5225cab421c915f7f
 -bb9b1a15f7e80483162049dfd981d059dc69d03348b521f7ac164a8cd3ae3cc4
++edacf8034dc6bd892038c220c480ea512dbb4005db2a6b1f8e679e8a4929c6ed