Merge the version 3.39.0 release candidate 1 changes into the

begin-concurrent-report branch.

FossilOrigin-Name: 1b28ad2caa3e43bd8011616edcafd15bdc6b4612afc43a024fc240ea85cb246e

diff --cc manifest
index 0218219bc9689b605aef373e3a0ea55bbefd2122,51878d8cb9d39eb6c4c1818c9d094bf72411eb4a..04351132fd154d94e48782252fde31620dd94b33
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-06-16T13:44:18.271
 -C Merge\s3.39.0\srelease\scandidate\s1\schanges\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-06-24T14:55:19.368
++C Merge\sthe\sversion\s3.39.0\srelease\scandidate\s1\schanges\sinto\sthe\nbegin-concurrent-report\sbranch.
++D 2022-06-24T15:04:44.186
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -513,12 -512,12 +513,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 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c beb9bfe3e08c5cf5f21bb95547e080489150b20a51f92706a7cadbc85afc0f37
 -F src/btree.c 890831d57243e833584bfcdd0df2720b3e340055901ce65dd0057746c628204a
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
++F src/btree.c 081cb5bd5ad2b93d70000bbca2824d32a83afc6732d3c425beaba0b5885fcfad
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h ed074f13b5464ea021fed9f8de2dc5cf45c7e5fa58ec98550fdc24229b11d25e
  F src/build.c 3c0a57703b4a21325829be1eff3b2d69d564afde2dda326f0eca674f9df3d0e3
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -574,14 -573,14 +574,14 @@@ F src/pragma.h 1f421360eed1a7721e8c5214
  F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45
  F src/printf.c 6166a30417b05c5b2f82e1f183f75faa2926ad60531c0b688a57dbc951441a20
  F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
- F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f
+ F src/resolve.c 1655e44c77c51ebbe82924287528a78bd4a4aaaf34189dbae28d19ccf2ca615c
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c fe52e588e4e86aff734c47f915163d216b673ccca5d94dcc1909e874cf9953c6
+ F src/select.c 2d2a7636b681ef57d85f18e8d69257175f3cbb286e704a4044690884a3031a6b
  F src/shell.c.in bc98de54298e16f0552fef4b8640c1fc4b5bab04b56cbb37f9d86994805faa21
 -F src/sqlite.h.in ae776f833186d61754229e190fd062d2b4f7e9ee49ffcb5808e212b12b1ba6fa
 +F src/sqlite.h.in 8b71c0198199c7e69bef13f3adf6f0ceebe5c0b07f433c5c929b7a686c1177a1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
 -F src/sqliteInt.h 38a25ea4502e68ed3ebd266ec664fd08ed8460dda61ff5f26e215f7a884af729
 +F src/sqliteInt.h 0a104fc310399fd40c4ea9cabe0f3bd6be669cdbfa20283739647c294f017527
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -648,11 -647,11 +648,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 e43c2cc12b91673db49ad269877d84bd631e1d92aa2c8913d2a4ee494b7e656c
 -F src/vdbe.c 2c7aaff87b2507fc7f6616dc49d6bced7c5b2ea5e40ed540ff69165bbbdcd1f5
++F src/vdbe.c 492e9b2cf363629e107139cd8d21268aa31a92a6c445d85afd68e042235da8d7
  F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
 -F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
 -F src/vdbeapi.c 602610f1252d59cd69742f78a1e2f6fbae40a4b407f5506a6a7b869b0df08ff2
 -F src/vdbeaux.c b769bb218a5cf1a621e8cdb137937625d1159bef29edc6a78c349665a5f6161e
 +F src/vdbeInt.h b613abeebbdc4003926e175e5e7b8be6d20c34c874c3a3aa8703007e6d3a54fe
- F src/vdbeapi.c 586ee6b57c507fc29f560ff3aca0b285244d3a9eba60732a067ed598fde1d744
- F src/vdbeaux.c 22dde0cbda611cd1aa4531eb2d8fb88980aa6cdd893b85f33c80a81e59730080
++F src/vdbeapi.c cddd057e2f505f940f31f56cfe808c36c6e0c061c0a20c8b7c1301ebf84a541f
++F src/vdbeaux.c b90acf28b176228d2004fa9b37e2d8344a3cdedf65b3540c91321bce63155d03
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
  F src/vdbemem.c 3db315458f8dc158aff58719795441437dd6c0fd302e9d9379a8f2a61e185ad6
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@@ -663,10 -662,10 +663,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 267caa227dd38ede46959468118ef4067316dae589d889c200911ff77df53ef1
+ F src/where.c 9a44063e60d8f42dd9dc8147b8e8dcfc315bbd13e25c395211292c36d828c869
  F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
 -F src/wherecode.c 0b09abfcb88c61c6a6984a3e065786631ff35495e9bdf865e6b74ab0a1299c5b
 +F src/wherecode.c ac444e3c1ddb5ec1d77f959125a97b2403b90dd8d653bcb504dff35a9dbc47d3
- F src/whereexpr.c 20255cf03e0b765b742301197d165511ff99e95da0d7ee9c8a2ebc1e888dd049
+ F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
  F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -1995,8 -1994,8 +1996,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 034d2c511a8ee7c2c02cb39f1df41a01f9daa72378b59bbb5e01b0257ed7d906 221e07ed783b878c0148feb57aaee0b80ee5567d9176b3ddb8dd853e02a9d08b
- R 90802af1f95713c31b2a2c8c3cad207a
 -P 221e07ed783b878c0148feb57aaee0b80ee5567d9176b3ddb8dd853e02a9d08b e93fd170ce4ae91d572c46d03f68f55d00091d0188030517455017d90d212587
 -R 8d0a95bf24c4f013a4a7a8e0221c877c
++P 8b446d0b85b66e8164e423bdc7f060f9b6cd854475d10bd41b820133b43e42f5 5ae706a401224581e370b934aa32fd8001f6597b6b38c45a75f13ed0c72b9118
++R 2d4bdda600c567c09c2251889808e8cc
  U drh
- Z e7559b7078bb75750e5c3c9bbc1c10a0
 -Z a2c989390f2ef296c84c665d5f8198b2
++Z 96eb0d4f1a9965cd2c9c2c17e7e3256c
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index b063b6dcf11a1b4888b782c3b7430ded45d923bf,ee6b839797d0f53c039e659c7e56630ba68a100a..807c569d4f7984fae4ba598fa3020ea97a7a1fcb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8b446d0b85b66e8164e423bdc7f060f9b6cd854475d10bd41b820133b43e42f5
 -5ae706a401224581e370b934aa32fd8001f6597b6b38c45a75f13ed0c72b9118
++1b28ad2caa3e43bd8011616edcafd15bdc6b4612afc43a024fc240ea85cb246e

diff --cc src/btree.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge