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

Merge 3.40.0 into the begin-concurrent branch.

FossilOrigin-Name: a06d57ee9e2862b2c67dc97e3702c00339341ba308d6558b7694e5b9e47231ac
---

5615eac7d0f5e7a1ceda7b9d0bc55c43ecf9ff8f
diff --cc manifest
index 1b7387c3b0,a86d2fe408..bf43265be1
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\s3.40.0\src1\sinto\sthe\sbegin-concurrent\sbranch.
- D 2022-11-14T12:44:31.890
 -C Version\s3.40.0
 -D 2022-11-16T12:10:08.388
++C Merge\s3.40.0\sinto\sthe\sbegin-concurrent\sbranch.
++D 2022-11-16T15:59:15.425
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -652,8 -647,8 +652,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
@@@ -2071,8 -2055,11 +2071,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 b361ee983ca45e8ede70413c549d50d20c69a055f387c5ce749da9600374921b 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
- R 331d9100dfab8ce00f5ab297a28c37f0
 -P 6ee57a2e4e3399481100c40da0229d2d33cbe3290016185c8a60839d14b209f6
 -R 05517d79d8355d06966e47ba4dd15a19
 -T +sym-major-release *
 -T +sym-release *
 -T +sym-version-3.40.0 *
++P 5ba588e7eb04205aac134061c7c33c844c8b8ac33ff2ead3f53c59ae52afdc2e 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318
++R 5d1423a65fea9f821713bc24303d5e9c
  U drh
- Z 5ba6748d81219217eefeb369bd9456bc
 -Z ec924bc422a55f57f049fa2ef8df3b06
++Z 99242b23136a2de7553c45a0f3fa98b0
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 450be4df69,5a7c4d607e..ba9738a147
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5ba588e7eb04205aac134061c7c33c844c8b8ac33ff2ead3f53c59ae52afdc2e
 -89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318
++a06d57ee9e2862b2c67dc97e3702c00339341ba308d6558b7694e5b9e47231ac