From: drh <>
Date: Tue, 16 May 2023 13:00:36 +0000 (+0000)
Subject: Merge all 3.42.0 release changes into the wal2 branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d2f5f465582601d492e10ea0da394bdab62f5df;p=thirdparty%2Fsqlite.git

Merge all 3.42.0 release changes into the wal2 branch.

FossilOrigin-Name: 137057f95778b3c913854d2182d0fbbfd9dd117db5566dabb5a22d927a59de62
---

5d2f5f465582601d492e10ea0da394bdab62f5df
diff --cc manifest
index 4871a4358a,515248a699..4bcb9b65d4
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\sthe\slatest\s3.42.0\sbeta\sfrom\strunk\sinto\sthe\swal2\sbranch.\s\sFor\ssome\sreason,\nthe\sprevious\smerge\sdidn't\swork.\s\sProbably\sa\sPEBKAC.
- D 2023-05-13T15:07:27.887
 -C Version\s3.42.0
 -D 2023-05-16T12:36:15.536
++C Merge\sall\s3.42.0\srelease\schanges\sinto\sthe\swal2\sbranch.
++D 2023-05-16T13:00:36.381
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 764f2e3e8fb4ae1c8dfe03e65b2b3b01bd1fc57edf78ec2cab3a1301e90e1905
 +F Makefile.in e9c71f89ac588465e882ac424fa2f567d628ccaf18c967ddfb99a068d0679a71
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 1305ba03fb050fe0a00cbd8aed04456f68a49b53a355ea0b180cf19d2e0c5abc
 -F Makefile.msc ce7bea7931e1ef96b0f44c0362074a8bb62e61a0e7cfdb05afebd928adaacc2b
++F Makefile.msc 4ec8369d75cc0a6f833eb49cfd5a31db5a0094a83474271b488e51523eccd816
  F README.md e05bd8fcb45da04ab045c37f79a98654e8aa3b3b8f302cfbba80a0d510df75f7
  F VERSION 17f95ae2fdf21f0e9575eb0b0511ea63f15d71dfff431b21c2b4adbfa70cfbbf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -719,10 -718,10 +720,10 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
  F src/vtab.c 4758a96d36c9a120848386ae603b1ab32a4876e0a1faf81bfcfb524455e583dc
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 7a65f64bfe4a783c5e2df73ffb0efc383dec934dee9e3ac706b2eeb3631d17ac
 -F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 +F src/wal.c 2bda91cfc1d42df42b013f59c008a6b9ad8827b3453779020b355bc809344272
 +F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c cec6a06508239c09e3637b52a12484fc9a84dc4302d45b4a311cce2ea6e4fd47
+ F src/where.c b74a83b4c8f65b218c5c1c8d9122433f85ee1300fd9263ba1697d0e1040eeb36
  F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
  F src/wherecode.c b300db0bcd84ad6c2642bf3f509f92fad7b7d697b9856b64dd66d692d184d054
  F src/whereexpr.c 22cf19b0ececeaf838daed1039c5231a8778784eba5ad67b991442a23473fd3f
@@@ -2008,9 -1995,9 +2009,9 @@@ F tool/max-limits.c cbb635fbb37ae4d05f2
  F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
  F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
  F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
 -F tool/mkctimec.tcl 38e3db33210a200aae791635125052a643a27aa0619a0debf19aa9c55e1b2dde x
 +F tool/mkctimec.tcl 64c69c774528f23d623b3b295f4714b49d2b9b44ec0f282b617a3816f1b94bf6 x
  F tool/mkkeywordhash.c 9822bd1f58a70e5f84179df3045bba4791df69180e991bec88662703f2e93761
- F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
+ F tool/mkmsvcmin.tcl 8897d515ef7f94772322db95a3b6fce6c614d84fe0bdd06ba5a1c786351d5a1d
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl 769d9e6a8b462323150dc13a8539d6064664b72974f7894befe2491cc73e05cd
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
@@@ -2083,8 -2070,10 +2084,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 771361e19e5b7f944cd2cfecb064b39175b892148fa877b763170744bca0b0cf 67001887044da71ab50c07d8345bd950a0a1f9688cf9cd6966312ea163cf6e17
- R a52ac04157e50a5078ca4fe4b89aa0ff
 -P 4254f086419892634c80b0b915e14edea365adc6a45bcc75eecba889da274ac3
 -R 5363a07f3e1462ec2f4570a33edb7167
 -T +sym-release *
 -T +sym-version-3.42.0 *
++P 3bbfbdcd9b0e03b1ed50f41b1714ada5d241b8030f73ced8d0da8fff28a268e0 831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0
++R 59994741ac5f3ba035ff58d51126c98c
  U drh
- Z 802f6ab231d9d3d750f4ba65d6807a87
 -Z 0ee8e0816fa6ac728bed7565aed4ec35
++Z 44145ee2c96212f96c05cd0bc7882b39
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index dc974e550f,8d5c8bc91b..e1b84080a7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3bbfbdcd9b0e03b1ed50f41b1714ada5d241b8030f73ced8d0da8fff28a268e0
 -831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0
++137057f95778b3c913854d2182d0fbbfd9dd117db5566dabb5a22d927a59de62