Merge fixes from trunk.

FossilOrigin-Name: 2af372f59ea250ccf9ab7c30fe4bf8376a5da6e35c401edf643b9a193a38d33d

diff --cc manifest
index 9c93d8429633d1cdbe6af34ddaf8e541fe17a8b5,128609c9ae2d472b8ec2a98aeca2da958cba1226..47e306dfadd79241c66966508059be3f11198d24
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
  B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
- C Fix\sa\scrash.\s\sNot\sall\stests\spass,\sbut\stests\sdo\sat\sleast\srun\sto\scompletion\snow.
- D 2020-07-14T02:03:35.734
 -C Early\sdetection\sof\sfreelist\ssize\scorruption\sin\sincremental\svacuum.
 -D 2020-07-14T12:40:53.857
++C Merge\sfixes\sfrom\strunk.
++D 2020-07-14T13:02:30.804
  F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
  F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
  F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@@ -52,7 -51,7 +52,7 @@@ F tool/mksqlite3c.tcl f4ef476510eca4124
  F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
  F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
  F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
- P 221e021077e2bbce693a89a16361418ced20f4e8f5a27e8c461648cff663a2c5
- R 03cf3055552c9116f3d2ae51d09e55c1
 -P 9cb03beae42d814a1b1b69f72865fde502d3f443313ec29edd010d1de40225eb
 -R 6c75ad267939fa9d328d6d874eb3a742
++P b5d38e28c62dbc4f5f0e1b2590c9d6c2de9a140cc3528cae1968fd741e337fb0 f25a56c26e28abd44373230c6b5763aed35c9a7648abede8a53409dccc0bee1d
++R 7d63caad10b289fd88b705df244223bf
  U drh
- Z d0e31887101317936a03df831aee09d5
 -Z 34c5068e51b7d65d7ed7e485c5f919a6
++Z 6ff44f5cef953a51b304c32568d26b12

diff --cc manifest.uuid
index 6397d042f182f40f7a659d361f3f666a8f897f84,ee6465087b7a378fee68912ddf9e595c41303a83..80ebd5b4dd274d10a5f81ca01583b9c90fe707c5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b5d38e28c62dbc4f5f0e1b2590c9d6c2de9a140cc3528cae1968fd741e337fb0
 -f25a56c26e28abd44373230c6b5763aed35c9a7648abede8a53409dccc0bee1d
++2af372f59ea250ccf9ab7c30fe4bf8376a5da6e35c401edf643b9a193a38d33d