Merge the latest trunk enhancements into the wal2 branch.

FossilOrigin-Name: c8ad869938b06378f49c02655c00ee4f3315e1275d15e69d4ff61d6f60230fe8

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 858e2312835a91f59fa1492841928468619923f2,2257d3ea10de25d5f201a2ba2217455ea22435c1..9807fbe4a89f16ebaad00cf91a469c138ca3aca3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
 -C Improvements\sto\squery\sinvariants\sin\sfuzzcheck.
 -D 2022-06-15T20:18:44.107
 +C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
- D 2022-05-28T14:44:19.777
++D 2022-06-16T13:44:49.125
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 6e2350cc3bed7a467fbdaa3ce42e665627aa91c9344c464cd21e750b75280181
 -F Makefile.in bccb0ed3f05fc41aee15da77c844c48b5da419cbb9af35b8a147536c9ad1c822
++F Makefile.in 915ed9176f23f867575c1bd4e2d4b8a60e4e61965538b52418508f1c226558c4
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc f969c28231012e50ee07c5062ee1dd5bbfc00883d52573af44b4fd477ec63843
 -F Makefile.msc de7cb3e095ce2fdc33513ccd76ebdaeda1483d0ddab0410fe65cbdeadd4c0ee1
++F Makefile.msc 028810319c9b921358303610bc64b0b7689b23a5810435a56bc268d45bdbee3f
  F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
  F VERSION fa8e7d2d1cc962f9e14c6d410387cf75860ee139462763fda887c1be4261f824
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -490,7 -491,7 +493,7 @@@ F ext/userauth/userauth.c 7f00cded7dcaa
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 50dac6249cce84aca4a365127a771b0a32247b151d64752997cc679660e0c3c4
 -F main.mk a5412510e5ec952915a7fda34e02079bb4e6ff8f97903f2a3d9ad2dee3e18044
++F main.mk d486b4a787c6836371d1f769e7f29074c519d7ec998bc09c036018a0adae6207
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -509,7 -510,7 +512,7 @@@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa2
  F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
  F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 01a6bd849a63b1ae8ac01aa21e58637a3c7db29bdc687269e476f3d20f39ef2e
 -F src/btree.c cc49f394c156f101ff12449a21ec1478f60e1bbd287fbf5fec8c2322dc55cccd
++F src/btree.c db537493a3aaa2ee44631bb9ddad305b457561531114b5b084d7286ad0ea5a12
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
  F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
  F src/build.c 23f874642825d7eaaeeb7a3281b2b1a75e1d4c4dd9ae4dceddcd908266634214
@@@ -556,8 -557,8 +559,8 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c 2df2b33db88f00af13805d4573ee126bc5973f9e3b91d03c575fa7ba64e7dc41
  F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c edd204a77e24583e4be80f8e0c596a5a2d941cafc618ac4c17f724893cfc704f
 -F src/pager.c 74596fc3d5d8a50de32c37225fc300cccd5ea27ea303c5f4b845d6572f999c5f
 -F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
++F src/pager.c adb8600c3ff85ad95973379f7132c01d6f2cc5265df959ac3d589f075d004dc3
 +F src/pager.h c49ff262186a78bc5f27e3891edefb900afa769b9e2eaeca0322c7f3553536d4
  F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@@ -641,9 -642,9 +644,9 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
- F src/vdbe.c e2ce1c8c86bba823698b1c176283c8b06fbe19c2a1e7238822cefb4f6bce7e3e
 -F src/vdbe.c 1c254d8ae4eeed388ed61e32a285571cfaf7d8c38c21f335eef20edc0c60c5e8
++F src/vdbe.c 4842b98a3043d8fbb0e06de81492caac096a0625301e0f7a14270ad67b28df60
  F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
- F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
+ F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
  F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
  F src/vdbeaux.c 75c4f75ed7e1d12eb3d80093a160ec998c839f3008a1c3c967fc5acf522d0e3c
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
@@@ -653,13 -654,13 +656,13 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
  F src/vtab.c 3d72c780d1ea08906a198e4f033921a658a54590e3ed72c544995d84f3f9464a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 -F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 +F src/wal.c a9cc35881efbb97e568b654dffa2716cf4c5d3fd15489980ab96e48fc5bc60a7
 +F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c c4b64c6fa224e5b89ed547ec0ebdfd243c081509b195e71581164a2fbb8d4a80
- F src/whereInt.h 8da918f392bf202ccc0ee61291455b33ad171d209445f1ff3eaf62e0b6f6b363
- F src/wherecode.c 2a8a73bcf1886632f2b2247c79395f94852a4b74484d8aa70a005892ce73d339
- F src/whereexpr.c 7c5ee52e1df81d6a43f39e6b6f35d540fd37254e2b6e953a4e2715c3abf26f46
+ F src/where.c 267caa227dd38ede46959468118ef4067316dae589d889c200911ff77df53ef1
+ F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
+ F src/wherecode.c 0b09abfcb88c61c6a6984a3e065786631ff35495e9bdf865e6b74ab0a1299c5b
+ F src/whereexpr.c 20255cf03e0b765b742301197d165511ff99e95da0d7ee9c8a2ebc1e888dd049
  F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -1983,8 -1977,8 +1990,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 33d77fea4084c5aba9203dfeddb820424f102dcb8347dc59e32b922bdb241382 7e87892c249f023ee9ed1d5f75a9ad8db10fb38f14dd9e6954b12b9b28400b07
- R c9081974dfbb7d140ac326c1bbce54a8
 -P 56c60a35ea457f06db58ec3f694a1ae16fd03e6625da1d7879d63d72bbcb1c62
 -R 31cb1a38d873229e67ac58c6da93b5d2
++P 934656f13dabc41ccf307b10dca7377c758b8a3b93eca57c072745c2786d6b3c 3a461f61b47e6ba6d5dcc2b7470ebde512b57bc68086f65050e07b06f42b7351
++R 25e193ae4a494f5ff48654bafa28631f
  U drh
- Z bbe2f38f083ae616992549cc7e11561e
 -Z 1dfdc8c41c0d4bc708c84e77e53555ca
++Z b958844303a6732e4928e10fcec459d3
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 1d190a1cb4a4c73922d42a4ee542e93f055ae2f1,5e298752d74b03fd289e7901f6d531129f7cad76..415de2a981ee801b563cf85d58840dc246e8b72b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 934656f13dabc41ccf307b10dca7377c758b8a3b93eca57c072745c2786d6b3c
 -3a461f61b47e6ba6d5dcc2b7470ebde512b57bc68086f65050e07b06f42b7351
++c8ad869938b06378f49c02655c00ee4f3315e1275d15e69d4ff61d6f60230fe8

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/vdbe.c
Simple merge