Merge the branch-3.45 patches into the wal2 branch.

FossilOrigin-Name: f8cee91f5d3eab534534c278146cf0876d54e467e7f51369b8e81c532ede9f54

diff --cc manifest
index bf4e95e384e2ed511310932ae9db45ef81b5078a,ad892d5099f992b5987fe508aea088a111fc63c8..3bf860db0ced1d3605414dfea2bd9b549f86f784
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\schanges\sfrom\sthe\s3.45.1\spatch\srelease\sinto\sthe\swal2\sbranch.
- D 2024-01-30T16:53:20.984
 -C Fix\sthe\s".import"\scommand\sin\sthe\sCLI\sso\sthat\sit\sworks\scorrectly\swith\stables\nthat\scontain\scomputed\scolumns.
 -D 2024-03-11T11:26:20.409
++C Merge\sthe\sbranch-3.45\spatches\sinto\sthe\swal2\sbranch.
++D 2024-03-11T23:23:52.793
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -678,7 -677,7 +679,7 @@@ F src/auth.c 19b7ccacae3dfba23fc6f1d0af
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
  F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
  F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
- F src/btree.c 9df6edc7e5c1f69a27a13fdaf9c67d65f3c1a08c34b01fb1edfa25bac403f22d
 -F src/btree.c 5410768087e524f331816c751c4b1f714693fa864a448337e443e49cc397aeaf
++F src/btree.c 555598d2aa29a6f7a1333d8015516fa83f746440c22c1f5d5a88933258875df0
  F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
  F src/btreeInt.h 3e2589726c4f105e653461814f65857465da68be1fac688de340c43b873f4062
  F src/build.c e7d9044592eeeea8e78d8ae53ca8d31fd6e92ca0d4f53e2f2e8ccf7352e0b04b
@@@ -732,19 -731,19 +733,19 @@@ F src/parse.y 020d80386eb216ec952054910
  F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
- F src/pragma.c 54dd8e18efaa3c4eecce92dc68d1d148409d216367df3a99b93dbad9870fdbf1
 -F src/pragma.c b61a1a1801befe6763e787b96988deb156a56e82a2b4dea004bc78e4551c9d5c
++F src/pragma.c 2719655cdd0f654e88bd07b8fde8e5d9d1e743c621d023cc1377d057f42e1b7b
  F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
  F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
- F src/printf.c 18fbdf028345c8fbe6044f5f5bfda5a10d48d6287afef088cc21b0ca57985640
+ F src/printf.c d3392b2a20ee314ddeef34fb43c904bf4619eb20ff9a9e07e3950a7e4dcd6912
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
- F src/resolve.c e25f51a473a5f30a0d978e4df2aaa98aeec84eac29ecae1ad4708a6c3e669345
+ F src/resolve.c 446bcb8ebf0ea7066c2ca99e5336f0dbc9230ac76f80fafd1bfa82fe7871af2d
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c f1a81ff4f8e9e76c224e2ab3a4baa799add0db22158c7fcede65d8cc4a6fa2da
- F src/shell.c.in d1ed426aae2d547932971e8019939cacb4dfda8258e45b8924b250e488e2d53d
- F src/sqlite.h.in 61a60b4ea04db8ead15e1579b20b64cb56e9f55d52c5f9f9694de630110593a3
+ F src/shell.c.in f7cc8711aee604bc078a93d777ad7246980485c57fa3047408b0f842ba03c14d
+ F src/sqlite.h.in 020d7b7307dda51420dc48b47e5334eaface77baba6bd9818375d392eb3ab5b5
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
- F src/sqliteInt.h 73800d73e21180e6b3df8d0fe7d11758dc24367fd2b0b0075b48fc116de406bb
+ F src/sqliteInt.h 59e83fc2b01e7c7f550a9ab77fd5876a49f37acbf4cc01c031fc7947f95959d6
  F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
  F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -805,15 -804,15 +806,15 @@@ F src/tokenize.c 23d9f4539880b40226254a
  F src/treeview.c c6fc972683fd00f975d8b32a81c1f25d2fb7d4035366bf45c9f5622d3ccd70ee
  F src/trigger.c 0905b96b04bb6658509f711a8207287f1315cdbc3df1a1b13ba6483c8e341c81
  F src/update.c 6904814dd62a7a93bbb86d9f1419c7f134a9119582645854ab02b36b676d9f92
- F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
+ F src/upsert.c 2e60567a0e9e8520c18671b30712a88dc73534474304af94f32bb5f3ef65ac65
  F src/utf.c f23165685a67b4caf8ec08fb274cb3f319103decfb2a980b7cfd55d18dfa855e
- F src/util.c 078f040366d5bd5f47658d045f901c768c1c636c6eaea121f3a1cbd63c3edb5b
+ F src/util.c c346e2a811285f6bad8a87c862070207855159a783993d03ca20dea2c74ace04
  F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
- F src/vdbe.c 72a82930336d368085cbaf44888c10fc7ef03cdd9d45be10d49eebf7b8455798
 -F src/vdbe.c b2a45392265cb83f60251406039bf5255462d4a6d8deb05b2eaccab5abb2e20b
++F src/vdbe.c df29f80c0a5e77ac6fbea7eba55940a4c0dc74b62da8824b41988493d477fc4d
  F src/vdbe.h 88e19a982df9027ec1c177c793d1a5d34dc23d8f06e3b2d997f43688b05ee0eb
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
  F src/vdbeapi.c 8f57d60c89da0b60e6d4e272358c511f6bae4e24330bdb11f8b42f986d1bf21b
- F src/vdbeaux.c 60216d2e30675e1e5f7e3964eac403c3d0e57c2c7b98ab45171928b2d55bfb80
 -F src/vdbeaux.c 56900c9a41f23260c8346f212bd6005eb9171f9a2f70d0cfb1441a078a0e4b84
++F src/vdbeaux.c 568b6c1d2c0c3280a8cf1b8b81aa4a11c537bd2ebe76eaebca484fbaea387c75
  F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
  F src/vdbemem.c 0012d5f01cc866833847c2f3ae4c318ac53a1cb3d28acad9c35e688039464cf0
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
@@@ -1479,9 -1478,9 +1480,9 @@@ F test/pcache.test c8acbedd3b6fd0f9a7ca
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/pendingrace.test 6aa33756b950c4529f79c4f3817a9a1e4025bd0d9961571a05c0279bd183d9c6
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test f7caf8dd5c7b1da74842a48df116f7f193399c656d4ffc805cd0d9658568c675
 +F test/permutations.test 58188152f3e0e319cd916f5f6e1afb34c8d3a5219fe49fe62c0c706514e54970
  F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
- F test/pragma.test 57a36226218c03cfb381019fe43234b2cefbd8a1f12825514f906a17ccf7991e
+ F test/pragma.test cddd4b534d7fb5cf113d1308dea4231f3548e8a7f3a65d7d1cf4810c87090b5a
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 92a46bbea12322dd94a404f49edcfbfc913a2c98115f0d030a7459bb4712ef31
  F test/pragma4.test ca5e4dfc46adfe490f75d73734f70349d95a199e6510973899e502eef2c8b1f8
@@@ -1891,9 -1890,9 +1892,9 @@@ F test/upsert1.test a512e2f884d3a36159f
  F test/upsert2.test 720e94d09f7362a282bc69b3c6b83d51daeaaf0440eb4920a08b86518b8c7496
  F test/upsert3.test 88d7d590a1948a9cb6eac1b54b0642f67a9f35a1fc0f19b200e97d5d39e3179c
  F test/upsert4.test 25d2a1da92f149331ae0c51ca6e3eee78189577585eab92de149900d62994fa5
- F test/upsert5.test fff0dcfce73c649204543088d8e5bde01172676063ec9b8f8fc7f195abc386fe
+ F test/upsert5.test 9953b180d02d1369cdbb6c73c900834e5fef8cb78e98e07511c8762ec21cc176
  F test/upsertfault.test f21ca47740841fdb4d61acfa7b17646d773e67724fe8c185b71c018db8a94b35
 -F test/uri.test c1abaaaa28e9422d61e5f3f9cbc8ef993ec49fe802f581520731708561d49384
 +F test/uri.test 8f27eaa41804099fca15101e30fd1b29aebbebf32d4e3c24614fa6319216936d
  F test/uri2.test 9d3ba7a53ee167572d53a298ee4a5d38ec4a8fb7
  F test/userauth01.test e740a2697a7b40d7c5003a7d7edaee16acd349a9
  F test/utf16align.test 9fde0bb5d3a821594aa68c6829ab9c5453a084384137ebb9f6153e2d678039da
@@@ -2173,11 -2160,9 +2174,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 68c2b8d0ebd1a180c4828cb4996c6c5fd67386c3b6304edf587c255f8d067c24 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a
- R 47b4efbc00add3da3cc5618e45eef5f5
- T *branch * wal2-3.45
- T *sym-wal2-3.45 *
- T -sym-wal2 *
 -P 71120ea83783ee04c6dd9ef260f6ec528935b5ea3baf2348c6d5ec258093271b
 -Q +95a9c88b258f18ac671a4c712603931167cc8bd0b86e41481b200c08043338b5
 -R 7ba5ef65daab2c3aa274d6b8c040cb14
++P 5e980265c89bb1daf8b73cf9566ddb88695511b73685777686a891ca730c435b b26f24441f84a30deb9a562ab6c6de7543fbc3b3b93c34277964c9c21d734153
++R a74a2bcc005197667210a2a94a2c07a7
  U drh
- Z c0fb8cd81637ceb92cd560353121b8f2
 -Z a93afaa14e992589b98ee64c5f704190
++Z 6a4321a9dffad46b1a3e4984e199c0db
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 71874f58c199ea6c5d36e8184b07fbbe3177692a,3a60248f8bc1b87777aebdccca7b558501996d33..c104cc4292f7b4196906aa24979d8605122eec80
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5e980265c89bb1daf8b73cf9566ddb88695511b73685777686a891ca730c435b
 -b26f24441f84a30deb9a562ab6c6de7543fbc3b3b93c34277964c9c21d734153
++f8cee91f5d3eab534534c278146cf0876d54e467e7f51369b8e81c532ede9f54

diff --cc src/btree.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge