Merge the latest trunk enhancements into the begin-concurrent-report branch.

FossilOrigin-Name: 034d2c511a8ee7c2c02cb39f1df41a01f9daa72378b59bbb5e01b0257ed7d906

diff --cc manifest
index 8833fd7d0a3e733fcc898e9f9bb2f7ca2ecf933f,0560607eb8f3f593d81ee9a592d5a7e7a9926fed..9113371cd70be1d4fd1ba2fd99b8e5218bd02277
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.\nHad\sto\srestore\sthe\ssqlite3VdbeSerialPut()\sroutine\sthat\swas\sremoved\sin\ncheck-in\s[6f4d6f212a3558c2]\swhen\sit\swas\sinlined\sbecause\sthat\sroutine\sis\sused\nagain\sin\sa\sdifferent\splace\sby\sthis\sbranch.
- D 2022-05-10T12:24:58.271
 -C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-05-28T14:25:10.801
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2022-05-28T14:32:10.460
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -519,11 -532,11 +533,11 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 -F src/insert.c 173845e5a6bac96ae937409e4f876b631f26b31dabb9df8fd0eb3b130b2bb3a7
 +F src/insert.c 6d4f489cbd5f77b746ea86cae38dbaf26dfd374e017d57062572447007b5b10e
  F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 0705c2747212934183398f09891415d2f7f3113d0f543ccb205640210b20e617
- F src/main.c ecad8e6971277d0c7d79ddc69350ef11144820e1dad28f6108c7ea688ad15c96
+ F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
 -F src/main.c 5b70a47eef5f0f95fc35ee69f36a443d2b87345070feb6d18d1bc491b829484b
++F src/main.c 5792d921fc800a15be1cfa6d74305fc992cb8ec54c9bb3be906084bb1ab52551
  F src/malloc.c a9127efdcef92d6934c6339ea9813075b90edc0ce2e5c723556381a3828fb720
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -540,39 -553,39 +554,39 @@@ F src/mutex_unix.c dd2b3f1cc1863079bc13
  F src/mutex_w32.c caa50e1c0258ac4443f52e00fe8aaea73b6d0728bd8856bedfff822cae418541
  F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
  F src/os.c b1c4f2d485961e9a5b6b648c36687d25047c252222e9660b7cc25a6e1ea436ab
- F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
+ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 9e6c8b94feb20705123f583b4558377511102becd696aa84f19118511dfb4b79
+ F src/os_unix.c 79a0243b5890078b5b5b07fbf37ff4bce0e5d319278fa848f9fd9d91f642ec8d
  F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 8eca9eaa4d923029326869d6e4eb16ae6caaa7ef31afcae7320a0f572b39e1d4
 -F src/pager.h 7b2ec7bba30b21a97b68d5bdc0dbb82a75f48c4b1457180988f9d409fb789e16
 +F src/pager.c d4804a5d7b073cc60f2f66378f0701d0072a7ef792293e3d31f891d6f859f91c
 +F src/pager.h 03ea09dddd4852990d9151746a62b94ed1486f04abe5acc9ee0e80d8381bfcd9
- F src/parse.y 3e5bf8067ad4d9ea5305b890a47aaeafbbb29be6371736e7ff3902f7d33c6bcd
+ F src/parse.y 17c50d262d92083badeb60b3ebe4725e19c76548f90aea898ab07d4f2940a7d8
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
  F src/pragma.c d1aead03e8418ff586c7cfca344c50a914b8eb06abd841e8e91a982d823671da
  F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
  F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45
- F src/printf.c 512574910a45341c8ad244bd3d4939968ebdfde215645b676fff01cc46e90757
+ F src/printf.c 6166a30417b05c5b2f82e1f183f75faa2926ad60531c0b688a57dbc951441a20
  F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
- F src/resolve.c e9ee235c4151d2b7fa47435a219bfd30bf516a804d2f004639858087ebf3137b
+ F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 8d2d39df8eded0b02053d16aa58c1ec6ad881e7b36b2eaf72735dd4e5c504dbc
- F src/shell.c.in 55939cf6270dc0e57322ad4026a513259fe977420aa9e0ec5ce6a62f3184ae09
- F src/sqlite.h.in f5fbd4296357b613a403caab9520f0eff536cf096c80079d6f914b2ca576945d
+ F src/select.c 1fe2f931b7289960984226978fdd8a6eae2eb3095a464a736241bb693dd64301
+ F src/shell.c.in f7628583e3e9af448cb5dfec3792533ab884bcda9dbb2e847e10d2314439c5ad
 -F src/sqlite.h.in ae776f833186d61754229e190fd062d2b4f7e9ee49ffcb5808e212b12b1ba6fa
++F src/sqlite.h.in 8b71c0198199c7e69bef13f3adf6f0ceebe5c0b07f433c5c929b7a686c1177a1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
- F src/sqliteInt.h 08fccdb13be2eb0eb51e579dc256848fbc03dad8acbc9f7a367a36ac256cecca
+ F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
 -F src/sqliteInt.h 17a9c6f74e94e36c0ce7ddadfc19382e8666fe231ee2d789ab3fc30a10fd72f5
++F src/sqliteInt.h 8e1c8cb40d8e3a1bc229eb84d213285d6c01c537f6f5c32993f8bedd65bea154
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 1f6673991147bc2cecc08a40d22f9803b84c805b24b499fe727f392256f73474
 -F src/test1.c 95c688261edf59ff77676aca426b343beb9f90d6548ecb16189ce614e5a63620
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 +F src/test1.c 67b044ff004e64b15b4694fd37e79f073434624533c8f73c240fba5e5eee44fa
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
- F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
+ F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
  F src/test6.c ae73a3a42bbc982fb9e301b84d30bda65a307be48c6dff20aba1461e17a9b0ce
  F src/test7.c 5612e9aecf934d6df7bba6ce861fdf5ba5456010
@@@ -631,11 -644,11 +645,11 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c 5b7888f917936dda09f98b1fda164cff1dad44fb5e143436bdbb9dc3191ce2df
 -F src/vdbe.c 507acc3a6a7ed9e0c337f5f66a3fee71a42b948ad79c536232684232733039b0
 +F src/vdbe.c 09719cdedf9e750dd9a24b3218df687d746c1080ceebb0993fc1c4463cd8aebc
  F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
 -F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
 -F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
 -F src/vdbeaux.c 83e566a087cf1bf5901539554feb55d25b2be6be24d36c6682b2f30493c28006
 +F src/vdbeInt.h 93dc9060052bc894d6dce6568c319e9b1fbd9d8c581e526df0f62f08c4a56f62
 +F src/vdbeapi.c 586ee6b57c507fc29f560ff3aca0b285244d3a9eba60732a067ed598fde1d744
- F src/vdbeaux.c 931eeecd2e7ff76f0065dd0fd296941a28ba0abb2b214d7d4d3b27743ea74705
++F src/vdbeaux.c 22dde0cbda611cd1aa4531eb2d8fb88980aa6cdd893b85f33c80a81e59730080
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
  F src/vdbemem.c 7189090b72baa025f945a1ac8c61ee420c645254476e8a191d555db76dfea5d4
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@@ -646,10 -659,10 +660,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 419c0a98dd65b9419fd07bdd4f9facc61143c33d57b0dbeffd83cf38a2e0e33e
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c aa585b89bd65a81e44bdfb871b55f65bf8fda88e1bc85efda6c236fe8d2bd788
- F src/whereInt.h 4db5a877a9d1f38b5c928c1c84297c07f30b9a3bc1f5f66214cf1a8ef90a0556
- F src/wherecode.c e714c7ca73d01d316bdc6bec38cab36d6838d8a059775c6a5f239984baf84b41
- F src/whereexpr.c e036477ac8424de50ae5b36a71103405d3f86b33ba11125ec7a2a99d501b0622
+ F src/where.c c4b64c6fa224e5b89ed547ec0ebdfd243c081509b195e71581164a2fbb8d4a80
+ F src/whereInt.h 8da918f392bf202ccc0ee61291455b33ad171d209445f1ff3eaf62e0b6f6b363
 -F src/wherecode.c 2a8a73bcf1886632f2b2247c79395f94852a4b74484d8aa70a005892ce73d339
++F src/wherecode.c 226b38cb9c54b35f2a3ad4767dd6093405d16e608b3adadaad2a9c42c7b74ef4
+ F src/whereexpr.c 7c5ee52e1df81d6a43f39e6b6f35d540fd37254e2b6e953a4e2715c3abf26f46
  F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -1971,8 -1986,8 +1988,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 0bbf7be25d366e0a08866a3a7e74b9b4cd9964b970bf21e72cd636e4f5a489e8 f65bd76760320754652311adfd45e27fecaea4e5077b3c1eb59aecbf65b24ecd
- R 63e215358bfc4241510e8eaa291edb82
 -P f65bd76760320754652311adfd45e27fecaea4e5077b3c1eb59aecbf65b24ecd 7e87892c249f023ee9ed1d5f75a9ad8db10fb38f14dd9e6954b12b9b28400b07
 -R 417f6c7dfdf504c9dfaf8a8655d7eef3
++P e6b5224d71047b64499e04054e087b849e9c48b71f2d9abff65935633c1d10f0 d6f6ee5cbcd9b263bc2423ce90700ec238deea212d32888fa9302fa2479b7d99
++R ba5d2b057b320627832f523fcde2ed9a
  U drh
- Z d9579267cb4c1be8a971803459c3a1bb
 -Z 34b52369c34f2a089699e1c81906c977
++Z 0981be974d91f8ce773b30eb4c18f78e
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index e0385c79da8a7d553b32dff3c74e9f9c70897e95,1cea11e2bacf92a4e2ce344dad5ec17c0e4e78ca..854b86d989db7dafb7f51f6d0ab01998fdaa191a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e6b5224d71047b64499e04054e087b849e9c48b71f2d9abff65935633c1d10f0
 -d6f6ee5cbcd9b263bc2423ce90700ec238deea212d32888fa9302fa2479b7d99
++034d2c511a8ee7c2c02cb39f1df41a01f9daa72378b59bbb5e01b0257ed7d906

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wherecode.c
Simple merge