Merge the latest trunk changes into the begin-concurrent-report branch

FossilOrigin-Name: 4d6141f32dabc34a512695dd40a02a2c67dddfd5e0a7232a86a1975b27932607

diff --cc manifest
index 210700e4aed99a00b98af91a268d5a88c7e05278,fe823392ee1795087ee1fb1f68160747386d5865..9c25fb16031d8aa26e53291eda1264c77215d201
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-08-22T15:48:55.188
 -C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-09-30T13:29:27.494
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sbegin-concurrent-report\sbranch
++D 2022-09-30T13:42:46.347
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -531,12 -530,12 +531,12 @@@ 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 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
- F src/btree.c 6f00e103be3b8d89325a6d250027df93b4b15b4d3ae8f90cfcd41c47b8757812
 -F src/btree.c 976f21bb2c95143dab779e0f91de875ef8ef786b221eb9e630e3d88f3b56fbf4
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
++F src/btree.c 384c4d3166b6635876de6a8b28a8b1d8328b7b68e023099760009f9e35b7814c
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h ed074f13b5464ea021fed9f8de2dc5cf45c7e5fa58ec98550fdc24229b11d25e
  F src/build.c bfafc2f7e0f557bfe34f471288324cfb8dcf22b9e30e922ac6fa8ff2cedbfe70
  F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -558,8 -557,8 +558,8 @@@ F src/insert.c 0f17eea6204ab40b6a9cd02a
  F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
- F src/main.c 149bdd57c40fdb24d14db5891cec2119455cd08097ed5e610a0d50eafc58b886
- F src/malloc.c b7a3430cbe91d3e8e04fc10c2041b3a19794e63556ad2441a13d8dadd9b2bafc
 -F src/main.c db487c05a732709ae4c94f1592ceaa49e05d0f56257223f2ae7e0dec54a858c3
++F src/main.c d95face711f0d914726c0809d164f9a803822c2ab850ec3d43d503a06581b3b9
+ F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@@ -578,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 e0846a3c89c670bfcea7a8ffa9aa3cf24ba9e531d1664a8186e216f077e25f8d
- F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
+ F src/os_unix.c 950a6c57010c7d352fc5616ec036cbdaa942d6f7f54845b9c64c9eb6444bfb8b
+ F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c fbd4929984710be59496a76d023a32de571da5a75ec2e3647daae68fb191ee7c
 -F src/pager.c a992a87f6eaf5c850934d2b0469c6d50adafdff2a1fa425179ad4ca910a67838
 -F src/pager.h 7b2ec7bba30b21a97b68d5bdc0dbb82a75f48c4b1457180988f9d409fb789e16
++F src/pager.c 994f3aeb406974702b888df3e869fa26e3c376677d82e0d9f4a1a32c3c47bb41
 +F src/pager.h 03ea09dddd4852990d9151746a62b94ed1486f04abe5acc9ee0e80d8381bfcd9
  F src/parse.y 17c50d262d92083badeb60b3ebe4725e19c76548f90aea898ab07d4f2940a7d8
- F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
+ F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
- F src/pcache1.c 0b4245cd4964e635f2630908c2533cd8e9da7af3ca592e23ae8730aa25ae5eb9
- F src/pragma.c b57a859a366472131194a9ad35cd76d5920577226b04c884b1b9085605faa280
+ F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
+ F src/pragma.c 9bf7d8a2a9ad3bc36df3ec0d61817a44c38a1da527d59c26c203047f906e334a
  F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
  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 af6dfc9ab60f6a57f18299c1d0eeddfa24640fabe960a6a55023b2b8dbfe25c1
- F src/shell.c.in 868bc75568e3e2b1cb8952d60fb7d6f29db22a336baca958303aa9e788843161
+ F src/select.c 321a529476188dbd8ff1e795e1f78287c6ea0e895523081d3c3954f416b9766f
+ F src/shell.c.in d63f39feb7026824b845bbd34c84dc11d77e2e0f6b796cfc6338c832104591ef
 -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 3849b1be5ad7b5844c37ff30bb6aa2fc941645fe121d494e0cd1d57cc5fafc76
 -F src/sqliteInt.h 45d92bb0229e4d373b1771cae7e21b4f72ffcf81cc9c723b86abc1e35c66ddff
++F src/sqliteInt.h 8b42e08750456035eebcf21dd07c90f595c5c388211843d9d1a252770806b53b
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
- F src/status.c 1593e408e8e9ac956e8ecdf7db2728d8aa3e9da3405849f08c0f1f7ee7df86b5
+ F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  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
@@@ -664,13 -663,13 +664,13 @@@ F src/trigger.c bc70c58e713dcfb6cabe5cc
  F src/update.c c17295f85ad5e81bc040701d76c599915ab847098f2ed29149807c537fdd3cb0
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
- F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
+ F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
  F src/vacuum.c 5b7888f917936dda09f98b1fda164cff1dad44fb5e143436bdbb9dc3191ce2df
- F src/vdbe.c 2d665f339eeb1b8d7e225c9a170c7d0f8df853e4f15f4f336c390e72cace73fa
 -F src/vdbe.c 79a7cf50f5407777464de3830b89bc4c26bdaa4991c1c8efae89ab0ead8862dc
++F src/vdbe.c bc36bd69e97fef7bff99aa4264abaa8286d83935efbb7996c418b9f8bbc03640
  F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
- F src/vdbeInt.h b613abeebbdc4003926e175e5e7b8be6d20c34c874c3a3aa8703007e6d3a54fe
- F src/vdbeapi.c 0e9d7164da66ae3ae5b97d776d2e7d0539c5abc135fc39aaa6d121cce08db6f6
- F src/vdbeaux.c 31d0d17d4666f958043336ee89dcf8e317d8c8cda26201ce7a6a1f156663c83f
 -F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 -F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
 -F src/vdbeaux.c df2bbf6b5d6e45a7ab4061fb11f788fd1e4f91ae95ef0309cf8b9465f94eec83
++F src/vdbeInt.h 8d2f014eb068d69b23abe12b3dcc56a980dfa8ace5db732feb00dc33f7e26df4
++F src/vdbeapi.c c0ccaf0b18dcc5ff2c28b47ee1b4c5c723632685d7ea6ca2e0bb64fd046275dd
++F src/vdbeaux.c aaef22a5d3a73402ca200d199937a8669182dd4618187fc0dcb42ca54919cb8e
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
  F src/vdbemem.c c3ce80af15e2ff5c2824a8db881681cbf511376f13613da020bac6d320c535b1
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@@ -681,9 -680,9 +681,9 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 419c0a98dd65b9419fd07bdd4f9facc61143c33d57b0dbeffd83cf38a2e0e33e
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c 6d1ee6f6bc048406554176eb6146b27ac16ec96cca018848aa0b9836b2b71143
- F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
+ F src/where.c 63e712bcad47f70e94c2150976cd7da5040933699e3938d4189d064acbe40891
+ F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
 -F src/wherecode.c 6bb1cf9d0a4e3e04dab0bf0ea4a8d936a0dcc05a7e2207beeda6c61aea6dd341
 +F src/wherecode.c 9c6bd7fc32a426cf9d7b9f4418c021c7c49a6309bd29f924eb42f2acdc9c6005
  F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
  F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -2017,8 -2016,8 +2018,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 7726389cd50d5336d68c3c2717922b46c1674ccbf98b0e295b4331af7be8f7a7 7eac6136ab7fbb96c4bc2ba219191b2273a6fc0eca929bb0f12f666f7b1d12ab
- R 7347bd8dfed7da306fc70476c9a3561e
 -P 7eac6136ab7fbb96c4bc2ba219191b2273a6fc0eca929bb0f12f666f7b1d12ab f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646
 -R b360ae256bf0f6b653513a9a15e74219
++P 2ec6e9e134278f94caf4179168bf37d1d8d2016e9c2ba3ebb509b0e2910c3509 ba2539f6dee1fff4a7603554da2d91be76f8af3c523e113a7629c2dd31dacd72
++R 54582334dfd93ccef713e1236de66963
  U drh
- Z 1c7980581cb4eb4a4f1c83929a678e24
 -Z 0ad9bea01605c681dfde59344f3782cf
++Z 61526522592372e2f2f7f540e3517cbd
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index cb10bc17cc032fef6618bf82192aef7cd2379779,863fcf9b80cb6cc9852c339af5f6fb144dc0a6f2..97cb00351401ef0aa84d3e13183322c59178f110
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2ec6e9e134278f94caf4179168bf37d1d8d2016e9c2ba3ebb509b0e2910c3509
 -ba2539f6dee1fff4a7603554da2d91be76f8af3c523e113a7629c2dd31dacd72
++4d6141f32dabc34a512695dd40a02a2c67dddfd5e0a7232a86a1975b27932607

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge