Merge trunk enhancements into the autovacuum-pages-callback branch.

FossilOrigin-Name: c26c9e5040ef4c52f2a99597e3a7c3eabd52c905d874fc76ca10fd54b749fa97

diff --cc manifest
index d233a28ae7b22633552f23991f37a270602634fb,da493aacd07abc55dde6be8d419cf7420b4c4709..3a662b37688e721fd6792178f6a2754fd7d70c2c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Demostrate\sa\sprototype\ssqlite3_autovacuum_pages()\sinterface.
- D 2021-10-15T23:02:27.945
 -C Remove\san\sincorrect\sassert()\sadded\s4\sdays\sago\sby\scheck-in\s[9e2f06b84f994277].\nReplace\sit\swith\sa\stestcase()\smacro.
 -D 2021-10-17T10:31:09.158
++C Merge\strunk\senhancements\sinto\sthe\sautovacuum-pages-callback\sbranch.
++D 2021-10-19T18:00:05.736
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -490,9 -490,9 +490,9 @@@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa2
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
  F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c faa3248f55eb34269874273a85e682e25dc4a3aa50334ec80564c6fc1e394e23
 -F src/btree.c 0604f4af97624ffbe2f0757c559c51f57760c6ad3d8ee3ee94fa6ec5795f2832
++F src/btree.c 91e27692b94c44f7b64413b10dd777770d7e5f03767777bad15b11f95081c77c
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
- F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
+ F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
  F src/build.c f70d6375ea5b78daac5b1d24eab53ed7b81c3e68a17dff9581c50c0c06180e00
  F src/callback.c 106b585da1edd57d75fa579d823a5218e0bf37f191dbf7417eeb4a8a9a267dbc
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -1930,10 -1929,7 +1930,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 8a56de5b9c6f4522000f8d991373490b67b9e9d97f03c1ca2cf32816d84789ef
- R f133145eb98f519a7c135450fb3d5209
- T *branch * autovacuum-pages-callback
- T *sym-autovacuum-pages-callback *
- T -sym-trunk *
 -P 0bf42bb5611dc3f672cb898b8be245fd25f7a3862c1e0734effd18d75e812f22
 -R d4b6322f84cb79bf03b64299a4029b40
++P bb6f2b8b486c225043bc64e5f74ff6bbad6c5d1f337f0c81eeb6172b087bb943 03dff7196bb00f8e32f574f65745ceafb33ee3fdd169263121342859c362eca5
++R ea45a0ce3c28a03ec711229b14f24e63
  U drh
- Z ead09303b823a782b5e7be4edc1ec190
 -Z 3409a9b08242f867400967c13412f1bd
++Z ee1e455afa1bfa2d6ff7d572ca1b5b4c

diff --cc manifest.uuid
index ec3f9f41a61b12923bf65f3c29d4b2c3bd1046c7,d649a2f1f9aa350f103e114c5778a023ef7bd342..e2dba84613a68a9305614ef0bf9e6e986ca1cf25
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bb6f2b8b486c225043bc64e5f74ff6bbad6c5d1f337f0c81eeb6172b087bb943
 -03dff7196bb00f8e32f574f65745ceafb33ee3fdd169263121342859c362eca5
++c26c9e5040ef4c52f2a99597e3a7c3eabd52c905d874fc76ca10fd54b749fa97

diff --cc src/btree.c
Simple merge