Merge trunk changes into this branch.

FossilOrigin-Name: ac4ee69664278a828e0a64c5be3b96fdb6eb6acc95646a9425c667aea328791c

diff --cc manifest
index cb6a0296ca261e1d0051caa842be1e21dc093ba0,b053ae4c6976f9ed273325bf7a88c5d50e0c09a9..99b7c24f76b0aaac70ac2824a1eec18918521422
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\sleaking\sa\sfile-handle\sin\stest\sfile\swalsetlk.test.
- D 2020-05-06T21:25:39.157
 -C Fix\sthe\shandling\sof\sreserve-bytes\sso\sthat\sthe\smaximum\svalue\sof\s255\scan\sbe\sused.
 -D 2020-05-07T01:56:57.057
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2020-05-07T14:05:08.190
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -471,13 -471,13 +471,13 @@@ F src/alter.c fa2c3be9b0ebecfafb7062072
  F src/analyze.c 953a6c43870ccaf080597244e1eeb4dc2ff6cb84f9501b24e46323de36970b61
  F src/attach.c ff2daea0fe62080192e3f262670e4f61f5a86c1e7bea9cec34e960fe79852aa1
  F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
- F src/backup.c 5e617c087f1c2d6005c2ec694ce80d6e16bc68d906e1b1c556d7c7c2228b636b
+ F src/backup.c b1c90cd4110248c8e1273ff4578d3a84c0c34725e1b96dacd4a6294a908702de
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c a0f550b2df013c6ce2e16f2134b24750654717083679e8bd65d4b3eb991e0706
 -F src/btree.c b7b9b444d083f135ad0bfe973ba118916a25085160bae4afcbc232886aeb153a
++F src/btree.c d78458bf4cc0e33a7faa1ab9904ebd66c8a8c820d802b53c9d273b45b3dac667
  F src/btree.h 989ef3c33413549e3e148f3dcb46c030f317dac130dc86809ba6b9aa4b16c72a
- F src/btreeInt.h 887cdd2ea7f4a65143074a8a7c8928b0546f8c18dda3c06a408ce7992cbab0c0
- F src/build.c ec6c0bda1e43ef55e5f5121a77ba19fac51fc6585f95ce2da795bcedcf6e8f36
+ F src/btreeInt.h 5c8b8749805787313ecf49eb5be3ced1e94bbf8ef54bb01470ce6bd0d5185c67
+ F src/build.c 5566b570435d3511a0fd57388c124491b1f74e59561f0c1679fabe74c4c54b7a
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c e98518d2d3d4029a13c805e07313fb60c877be56db76e90dd5f3af73085d0ce6
@@@ -497,7 -497,7 +497,7 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c 8e4211d04eb460c0694d486c6ba1c068d468c6f653c3f237869a802ad82854de
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 421310045bd78afefb772294a99e50f37d87ae578786a6169074e6291e30d969
- F src/main.c 3f4a08e109b8b100230b62d0317de8b99ed4f2f8ac0f84c96d9bd53b21693f68
 -F src/main.c d832077d7a1e269c7c0e15ae845fcf80690a2880cb6520ef61f182c6631644f1
++F src/main.c 266393c10ff58d0919941f3187b54c0144b27d2f3fab8ae849eefbb89c48c451
  F src/malloc.c a3e13b001f988ecec6bdb90c0ea8912c8c786e623724d7098da623d8d01d19b1
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -1864,7 -1863,7 +1864,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 e89c864299024cdce395a15c19b000b976142b9eed267901a288adaa695f9e65
- R 3d441440eb789a6955c09c8d2e120384
 -P 63e659d9a793227604aa95685a8d83cd08305f1d01e135407a3ffc6d54482ab8
 -R 40c51b3c9fb1a999bf30ad6cc83f2430
 -U drh
 -Z 4244c9fee796a92a9333ce7d1083a8fb
++P 3cfc675e2e917b69108feb3a75728b573abe8e44f0890a7d20d307b0b6784c0e 99749d4fd4930ccf15227f67c732266af9e09dd3cabdc0834fb450ef98196441
++R a2fb9be328819586780eac9a007a3fb6
 +U dan
- Z 6de8f7ead6c68a5c01aa4ce7d42c72c9
++Z 26b45dc1c0a43ede219cdbbfa3466d04

diff --cc manifest.uuid
index 286ca7607ce47d00089202d1eb48b8097289a1b4,954b434a4f5be0de4630888ff5230fe0b8f99431..6fa7b45d5b774dd385cd433d589c5b67cd9fb813
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3cfc675e2e917b69108feb3a75728b573abe8e44f0890a7d20d307b0b6784c0e
 -99749d4fd4930ccf15227f67c732266af9e09dd3cabdc0834fb450ef98196441
++ac4ee69664278a828e0a64c5be3b96fdb6eb6acc95646a9425c667aea328791c

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge