From: drh <>
Date: Wed, 16 Nov 2022 16:05:47 +0000 (+0000)
Subject: Merge the 3.40.0 release changes into the begin-concurrent-report branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=029090962fd96ef057769a85b61c9ce0d3b6556c;p=thirdparty%2Fsqlite.git

Merge the 3.40.0 release changes into the begin-concurrent-report branch.

FossilOrigin-Name: 9fc6241017fa7212974ae1070496a76b3a4c4f6d54f597abbf8c0340d172fa68
---

029090962fd96ef057769a85b61c9ce0d3b6556c
diff --cc manifest
index 52a4b084aa,bf43265be1..dee1a574f7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-11-14T12:54:00.403
 -C Merge\s3.40.0\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-11-16T15:59:15.425
++C Merge\sthe\s3.40.0\srelease\schanges\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2022-11-16T16:05:47.749
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -653,8 -652,8 +653,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 917aafccba9b2061cc52471fefad26dfce4a490df4b04d763f28baa8e0b148ca
 -F src/test2.c 827446e259a3b7ab949da1542953edda7b5117982576d3e6f1c24a0dd20a5cef
 +F src/test1.c 144867d41cfffd4905ed439a62660da8b8fd49ec5616855767e02a50bee55bd9
- F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
++F src/test2.c fd13437e053100a838646ceda05a7b12b1c1ef61a9da2dbd96b5c4b94a0e0e45
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -2073,8 -2071,8 +2073,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 d8568a848a6be369291bdbcc54d8b1093a7773656c8ed78d2e1e12cb7a24b5b8 5ba588e7eb04205aac134061c7c33c844c8b8ac33ff2ead3f53c59ae52afdc2e
- R d82f99537830be4b12deeb7efecce012
 -P 5ba588e7eb04205aac134061c7c33c844c8b8ac33ff2ead3f53c59ae52afdc2e 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318
 -R 5d1423a65fea9f821713bc24303d5e9c
++P 4d3f2531a96eeca17a7e00f386c512be721785bdfccaff962931902f3ee4ba02 a06d57ee9e2862b2c67dc97e3702c00339341ba308d6558b7694e5b9e47231ac
++R f464d069898866ccdbb46b49f278ebbb
  U drh
- Z b18d08583b4dba4b267520a57ea1fe96
 -Z 99242b23136a2de7553c45a0f3fa98b0
++Z 5c833d5f3c90d3af46d3c9d1fa073cfe
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 12186cc91a,ba9738a147..8a1ed8ea19
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4d3f2531a96eeca17a7e00f386c512be721785bdfccaff962931902f3ee4ba02
 -a06d57ee9e2862b2c67dc97e3702c00339341ba308d6558b7694e5b9e47231ac
++9fc6241017fa7212974ae1070496a76b3a4c4f6d54f597abbf8c0340d172fa68