From: drh <> Date: Wed, 16 Nov 2022 16:11:07 +0000 (+0000) Subject: Merge the 3.40.0 release into the begin-concurrent-pnu-wal2 branch. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c524ff6526b4f8191c9552ba2878f422f248cc75;p=thirdparty%2Fsqlite.git Merge the 3.40.0 release into the begin-concurrent-pnu-wal2 branch. FossilOrigin-Name: a090de41be2a727cdb98f02df3d793d94101ca7004c1023c86ae2ad55b5f9c5b --- c524ff6526b4f8191c9552ba2878f422f248cc75 diff --cc manifest index 95e80a36dd,46b3e62db7..c891a57a81 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch. - D 2022-11-14T13:18:39.458 -C Merge\sthe\s3.40.0\srelease\sinto\sthe\swal2\sbranch. -D 2022-11-16T16:00:43.308 ++C Merge\sthe\s3.40.0\srelease\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch. ++D 2022-11-16T16:11:07.340 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -655,8 -649,8 +655,8 @@@ F src/sqliteLimit.h d7323ffea5208c6af27 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 4e64ba300a5a26e0f1170e09032429faeb65e45e8f3d1a7833e8edb69fc2979e -F src/test1.c 40c9a40975512985762f87b83d0c63e4904833a9fe78cbcca664a37095301b1d +F src/test1.c 917aafccba9b2061cc52471fefad26dfce4a490df4b04d763f28baa8e0b148ca - F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5 + F src/test2.c 827446e259a3b7ab949da1542953edda7b5117982576d3e6f1c24a0dd20a5cef F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644 F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664 F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d @@@ -2090,8 -2069,8 +2090,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 aa2e247b58dea930c4f0af3566d287f196ea178be8e994fc9eec685a89bebac8 a5a610a650b6b49f4bb5fbb8e2f43c730afbe88df2c3ae4ddf3d1e5392960387 - R bf634048a9309e706ba9fd2dd7b62edb -P a5a610a650b6b49f4bb5fbb8e2f43c730afbe88df2c3ae4ddf3d1e5392960387 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318 -R 7db376bcbace3b564ff46d50ac971aba ++P b0e2b9aa2c77af8c1e5b35a49f58610c8ac7063a63fd61c34bff6050348e068f 2df915ef04a64cc8027330013f73ac0ee1fee8cb6eb61f3a608c21ea419d5928 ++R dc1741efc143c2fb4c4d3d73a664670c U drh - Z fba0e24db4f0528106635cb0d3708ddc -Z b4d0c87deafe46748ff8025efaed08c3 ++Z 77aac3c4187a8013d5a466b29f7fd9c2 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 78b94f5024,fcf816135d..a8b68ddc48 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - b0e2b9aa2c77af8c1e5b35a49f58610c8ac7063a63fd61c34bff6050348e068f -2df915ef04a64cc8027330013f73ac0ee1fee8cb6eb61f3a608c21ea419d5928 ++a090de41be2a727cdb98f02df3d793d94101ca7004c1023c86ae2ad55b5f9c5b