From: drh <>
Date: Wed, 16 Nov 2022 16:14:31 +0000 (+0000)
Subject: Merge version 3.40.0 into the reuse-schema branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a5d7496e79080e7d1b9631dd12b99ebebac0214;p=thirdparty%2Fsqlite.git

Merge version 3.40.0 into the reuse-schema branch.

FossilOrigin-Name: 2aec00a7294762b3f7e8138ea1686eda4a1b02e940ec39f261651b61b87fabad
---

9a5d7496e79080e7d1b9631dd12b99ebebac0214
diff --cc manifest
index ddcf90929d,a86d2fe408..72fdeee450
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\sreuse-schema\sbranch.
- D 2022-11-14T13:41:22.770
 -C Version\s3.40.0
 -D 2022-11-16T12:10:08.388
++C Merge\sversion\s3.40.0\sinto\sthe\sreuse-schema\sbranch.
++D 2022-11-16T16:14:31.289
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -639,17 -638,17 +639,17 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
 -F src/shell.c.in 458cb3de9d548342fc645b699620b1af3de770d2ceec09ac71f86c19bd244064
 -F src/sqlite.h.in bdb10b78166f5b735318667eb16c84ac90d9e0de88cc25c193eeb4379a126945
 +F src/shell.c.in 8bdda47d835e220e7e6260fec089325c2802eb9e0d8796bf1f0f06c652887da7
 +F src/sqlite.h.in 5f708d11f312314b376da7d5178ff2ac199158f0401f023715690ee5919cc73e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
 -F src/sqliteInt.h 2c24ba38f78e32fe5d7ec136321a6ad827698b33ca98664970a8b7274d69ef7c
 +F src/sqliteInt.h 583cf2d0982dda1b0fc8fbf291890bbe8b7f2abf2b50983e91fa796cd04e0a8c
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 +F src/status.c 501433a8bdf64be125746a53bb9180761f9364428b59b318365eb88afd6d5cea
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 4e64ba300a5a26e0f1170e09032429faeb65e45e8f3d1a7833e8edb69fc2979e
 +F src/tclsqlite.c c5b9f6540d6de1adc6554589ce4011e07bb02250440a3e777ff86b40f1c1dd2c
  F src/test1.c 40c9a40975512985762f87b83d0c63e4904833a9fe78cbcca664a37095301b1d
- 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
@@@ -2065,8 -2055,11 +2065,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 833f6374cc81a9b732bd852de6f98eef6c437f9fb18846e0022c6726324fab25 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
- R 20548f17ccb5c5c07ea43692a286d7f5
 -P 6ee57a2e4e3399481100c40da0229d2d33cbe3290016185c8a60839d14b209f6
 -R 05517d79d8355d06966e47ba4dd15a19
 -T +sym-major-release *
 -T +sym-release *
 -T +sym-version-3.40.0 *
++P 886788b61e227a5e821eb92e01aaeaf19b2e9412408a9c1a351c85546452a807 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318
++R d895d42470e7754764a7d1b2f285f17c
  U drh
- Z 0fd4751246a259e63474f8c0e15e9d17
 -Z ec924bc422a55f57f049fa2ef8df3b06
++Z 880021cb07648deca41ce071718c2769
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4a4c329e09,5a7c4d607e..e31bd75bc0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 886788b61e227a5e821eb92e01aaeaf19b2e9412408a9c1a351c85546452a807
 -89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318
++2aec00a7294762b3f7e8138ea1686eda4a1b02e940ec39f261651b61b87fabad