Merge all recent trunk enhancements into the begin-concurrent-report branch.

FossilOrigin-Name: 2ec6e9e134278f94caf4179168bf37d1d8d2016e9c2ba3ebb509b0e2910c3509

diff --cc manifest
index e04f4a9e8b4c8a8bc454af3a2f180c155186ee69,e4a1087cfebc0084cc25f30ffb93c86c6dbe2a8f..210700e4aed99a00b98af91a268d5a88c7e05278
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sversion\s3.39.0\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-06-25T16:43:31.625
 -C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-08-22T15:42:15.563
++C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2022-08-22T15:48:55.188
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -513,35 -530,35 +531,35 @@@ F src/alter.c 0390ca1d69ec3626cfa9f1531
  F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
  F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 -F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 -F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
 +F src/backup.c 7c69378cf826e20778df98b33b80dd1976e96ad3cf6f2a0bc17e6e6b018148c6
 +F src/bitvec.c e67e4ebed581b5f0aa9155abd88177ed8b63eb40e9266b1483ce7f6eb9257477
- F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 081cb5bd5ad2b93d70000bbca2824d32a83afc6732d3c425beaba0b5885fcfad
+ F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
 -F src/btree.c 9a1e46b2bf7fcba713b1e0df6df2f13df6e9a5c01342f07c2f1a87aeaa0ea11b
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
++F src/btree.c 6f00e103be3b8d89325a6d250027df93b4b15b4d3ae8f90cfcd41c47b8757812
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h ed074f13b5464ea021fed9f8de2dc5cf45c7e5fa58ec98550fdc24229b11d25e
- F src/build.c 3c0a57703b4a21325829be1eff3b2d69d564afde2dda326f0eca674f9df3d0e3
- F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
+ F src/build.c bfafc2f7e0f557bfe34f471288324cfb8dcf22b9e30e922ac6fa8ff2cedbfe70
+ F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 026dbdcdbd8c3cde98a88483ee88310ff43150ab164ad768f12cc700a11495ad
- F src/date.c 15082566229d4b1e5f24fdb490bf9bcc68824b911d70e3573ef075a1b9e2d26f
- F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
+ F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543
+ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
+ F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
- F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
- F src/expr.c 4907afcb86d72b5525d8767515ce425ec53c7a2d3664441b46cef5b376ee0cba
+ F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
+ F src/expr.c 24e828db6b2fab8aabfb5d2c0d83dbdfc5a1972b1147fa893350e317ab7e282f
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
+ F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
  F src/func.c c4b2229aac24b3d7989ef51abae0e5e87e58e8bda3c7b6c55f76d231dbedfb8d
  F src/global.c e83ee571b79ee3adc32e380cf554cf1254bc43763d23786c71721fbcdfbbb965
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 6d4f489cbd5f77b746ea86cae38dbaf26dfd374e017d57062572447007b5b10e
 -F src/insert.c aea5361767817f917b0f0f647a1f0b1621bd858938ae6ae545c3b6b9814b798f
++F src/insert.c 0f17eea6204ab40b6a9cd02a73a1c4f58b57d2524bdbfdbd01924bc24b886d80
  F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
- F src/main.c 5792d921fc800a15be1cfa6d74305fc992cb8ec54c9bb3be906084bb1ab52551
- F src/malloc.c a9127efdcef92d6934c6339ea9813075b90edc0ce2e5c723556381a3828fb720
 -F src/main.c d283583b088c808f1f654846be69ef995622cb8df743f34c4d5d355fce389110
++F src/main.c 149bdd57c40fdb24d14db5891cec2119455cd08097ed5e610a0d50eafc58b886
+ F src/malloc.c b7a3430cbe91d3e8e04fc10c2041b3a19794e63556ad2441a13d8dadd9b2bafc
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@@ -560,34 -577,34 +578,34 @@@ F src/os.c 0eb831ba3575af5277e47f4edd14
  F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 79a0243b5890078b5b5b07fbf37ff4bce0e5d319278fa848f9fd9d91f642ec8d
+ F src/os_unix.c e0846a3c89c670bfcea7a8ffa9aa3cf24ba9e531d1664a8186e216f077e25f8d
  F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c abd503a24de8c97b39bbb72f40e5ce0fb31a8a3defeb47dfe6e3da5d198323bc
 -F src/pager.c 4d1b71b56de03f72006ab71b2a7cf69f981cae4a996248c38496a5f18dcd1ef9
 -F src/pager.h 7b2ec7bba30b21a97b68d5bdc0dbb82a75f48c4b1457180988f9d409fb789e16
++F src/pager.c fbd4929984710be59496a76d023a32de571da5a75ec2e3647daae68fb191ee7c
 +F src/pager.h 03ea09dddd4852990d9151746a62b94ed1486f04abe5acc9ee0e80d8381bfcd9
  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/pcache1.c 0b4245cd4964e635f2630908c2533cd8e9da7af3ca592e23ae8730aa25ae5eb9
+ F src/pragma.c b57a859a366472131194a9ad35cd76d5920577226b04c884b1b9085605faa280
  F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
- F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45
- F src/printf.c 6166a30417b05c5b2f82e1f183f75faa2926ad60531c0b688a57dbc951441a20
- F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
- F src/resolve.c 1655e44c77c51ebbe82924287528a78bd4a4aaaf34189dbae28d19ccf2ca615c
+ F src/prepare.c 971d5819a4bda88038c2283d71fc0a2974ffc3dd480f9bd941341017abacfd1b
+ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
+ F src/random.c 47c95aa668a3ba343b89645614e26ecfad444d732ec934fc35c6feb258b69478
+ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 2d2a7636b681ef57d85f18e8d69257175f3cbb286e704a4044690884a3031a6b
- F src/shell.c.in bc98de54298e16f0552fef4b8640c1fc4b5bab04b56cbb37f9d86994805faa21
- F src/sqlite.h.in 8b71c0198199c7e69bef13f3adf6f0ceebe5c0b07f433c5c929b7a686c1177a1
+ F src/select.c af6dfc9ab60f6a57f18299c1d0eeddfa24640fabe960a6a55023b2b8dbfe25c1
+ F src/shell.c.in 868bc75568e3e2b1cb8952d60fb7d6f29db22a336baca958303aa9e788843161
 -F src/sqlite.h.in 8134578d7027812e7c3cfdff69117b08f5a69592c5168dfc2f545368a284c9d8
++F src/sqlite.h.in e6746e12d2e4b481eab276654678445693adf6e78012db9eefb4545277236267
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
- F src/sqliteInt.h 0a104fc310399fd40c4ea9cabe0f3bd6be669cdbfa20283739647c294f017527
 -F src/sqliteInt.h 9c2801376fda7d70285c2f27edbbff29b5ae3ff1ba5af98ef4989260a6c4e74a
++F src/sqliteInt.h 3849b1be5ad7b5844c37ff30bb6aa2fc941645fe121d494e0cd1d57cc5fafc76
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
- F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
+ F src/status.c 1593e408e8e9ac956e8ecdf7db2728d8aa3e9da3405849f08c0f1f7ee7df86b5
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 4e64ba300a5a26e0f1170e09032429faeb65e45e8f3d1a7833e8edb69fc2979e
 -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 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -648,13 -665,13 +666,13 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c 5b7888f917936dda09f98b1fda164cff1dad44fb5e143436bdbb9dc3191ce2df
- F src/vdbe.c 492e9b2cf363629e107139cd8d21268aa31a92a6c445d85afd68e042235da8d7
- F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
 -F src/vdbe.c 164b4ec2a84dcaec60474622db758bbff0008903584fd8e3f81c12a9626529ce
++F src/vdbe.c 2d665f339eeb1b8d7e225c9a170c7d0f8df853e4f15f4f336c390e72cace73fa
+ F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 -F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
 -F src/vdbeapi.c 6af7b32ada7ef8facafa91f57aedabd91633f254b34e9c0901ab402d4238e553
 -F src/vdbeaux.c 50bf50c21a683f57d672ef36181b9863407a7783edf6b32f8a60a46a53bed7d0
 +F src/vdbeInt.h b613abeebbdc4003926e175e5e7b8be6d20c34c874c3a3aa8703007e6d3a54fe
- F src/vdbeapi.c cddd057e2f505f940f31f56cfe808c36c6e0c061c0a20c8b7c1301ebf84a541f
- F src/vdbeaux.c b90acf28b176228d2004fa9b37e2d8344a3cdedf65b3540c91321bce63155d03
++F src/vdbeapi.c 0e9d7164da66ae3ae5b97d776d2e7d0539c5abc135fc39aaa6d121cce08db6f6
++F src/vdbeaux.c 31d0d17d4666f958043336ee89dcf8e317d8c8cda26201ce7a6a1f156663c83f
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c 5ebf05c0182addedb1607ade848e1c83cef40981df94d1abfab0c59288c6064f
+ F src/vdbemem.c c3ce80af15e2ff5c2824a8db881681cbf511376f13613da020bac6d320c535b1
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@@ -663,11 -680,11 +681,11 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 419c0a98dd65b9419fd07bdd4f9facc61143c33d57b0dbeffd83cf38a2e0e33e
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c 9a44063e60d8f42dd9dc8147b8e8dcfc315bbd13e25c395211292c36d828c869
+ F src/where.c 6d1ee6f6bc048406554176eb6146b27ac16ec96cca018848aa0b9836b2b71143
  F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
- F src/wherecode.c ac444e3c1ddb5ec1d77f959125a97b2403b90dd8d653bcb504dff35a9dbc47d3
 -F src/wherecode.c 6bb1cf9d0a4e3e04dab0bf0ea4a8d936a0dcc05a7e2207beeda6c61aea6dd341
++F src/wherecode.c 9c6bd7fc32a426cf9d7b9f4418c021c7c49a6309bd29f924eb42f2acdc9c6005
  F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
- F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
+ F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test b5c19d504dec222c0dc66642673d23dce915d35737b68e74d9f237b80493eb53
@@@ -1996,8 -2015,8 +2017,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 1b28ad2caa3e43bd8011616edcafd15bdc6b4612afc43a024fc240ea85cb246e fb45624a319ed56268749d584839fa0a3c35d331513ca41451438dda988f9df8
- R 0dc06ae08e651aff0329e6b5bab620fb
 -P fb45624a319ed56268749d584839fa0a3c35d331513ca41451438dda988f9df8 c296a9d958ec360fc8d217363348b4918d665bccb3c4f27503a2dcef7db49052
 -R 27a469bab31712403789e98e8ac9581a
++P 7726389cd50d5336d68c3c2717922b46c1674ccbf98b0e295b4331af7be8f7a7 7eac6136ab7fbb96c4bc2ba219191b2273a6fc0eca929bb0f12f666f7b1d12ab
++R 7347bd8dfed7da306fc70476c9a3561e
  U drh
- Z 29b14e15e20507e7d997b7c7b6fb720c
 -Z 600c3503ed2408f0115cfa889dc65a5e
++Z 1c7980581cb4eb4a4f1c83929a678e24
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index f8f16b41e980dd8db68dc531de55cdfd01913be9,ea262969f7455b9000d6971363b67c083754cd55..cb10bc17cc032fef6618bf82192aef7cd2379779
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7726389cd50d5336d68c3c2717922b46c1674ccbf98b0e295b4331af7be8f7a7
 -7eac6136ab7fbb96c4bc2ba219191b2273a6fc0eca929bb0f12f666f7b1d12ab
++2ec6e9e134278f94caf4179168bf37d1d8d2016e9c2ba3ebb509b0e2910c3509

diff --cc src/btree.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wherecode.c
Simple merge