From: drh <>
Date: Mon, 14 Nov 2022 13:41:22 +0000 (+0000)
Subject: Merge the 3.40.0 rc1 changes into the reuse-schema branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a443c86e85f702c0137446a1484864a60887d07;p=thirdparty%2Fsqlite.git

Merge the 3.40.0 rc1 changes into the reuse-schema branch.

FossilOrigin-Name: 886788b61e227a5e821eb92e01aaeaf19b2e9412408a9c1a351c85546452a807
---

6a443c86e85f702c0137446a1484864a60887d07
diff --cc manifest
index 67b546ff1c,856e6d99b8..ddcf90929d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthis\sbranch\sto\smatch\slatest\strunk\schanges.
- D 2022-11-07T18:09:23.689
 -C Remove\ssome\soutdated\scode\scomments.\sNo\scode\schanges.
 -D 2022-11-13T19:29:51.810
++C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\sreuse-schema\sbranch.
++D 2022-11-14T13:41:22.770
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -557,7 -556,7 +557,7 @@@ F ext/wasm/wasmfs.make edfd60691d10fd19
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 4b2df0dd87d12eff590f4c3f83a46aa3a99d52556b6476768a25a622c859e2dc
 -F main.mk fd90f1bd90bd4070c9af7e9c8396bd0cf4208a0186c8d18fa6e2609dff447d5d
++F main.mk b8ead9822424a704faf2498e6351d5e29690db1e05c0c776d22231983e4204ec
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -631,23 -630,23 +631,23 @@@ F src/parse.y 8e67d820030d2655b9942ffe6
  F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
- F src/pragma.c d39068c344a1c77b7a02a71b9104ba4af0874c927940c85e49c91a0a7f9186e4
 -F src/pragma.c 894c2621d35edd4beea9b331cfdb1b42032394420074d2294c8febe548eea8a1
 -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 -F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
++F src/pragma.c 6e211923bc179edcebcceeaba003d554db232bd72f75457a9a1e27205e9c979b
 +F src/pragma.h 50f6d3b408ed56bde4f4e4aead8c0b2022030b692e8de237c1b7a0b5ce87a0c8
 +F src/prepare.c 740e262cc0e011ac4f6f02b8a51b3da6f51d7c0760423d5a72e80c4bc536bc70
  F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
- F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
+ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
- F src/shell.c.in aa3e9fa90b8f93e6f2d964afa44b9a144a233b670ae4a59cfb1b4b9234d7fe2c
- F src/sqlite.h.in 2d9a8a2f98a768504ddb5e4b010dc3324b52511bcc3cf26e0a32144a84b97d90
 -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/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -1996,8 -1986,8 +1996,8 @@@ F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl bcb2bd5affb545fd219ef0304c7978e2a356407ab723f45ec8569235892c1c3f
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 -F tool/mkpragmatab.tcl bd07bd59d45d0f3448e123d6937e9811195f9908a51e09d774609883055bfd3d
 +F tool/mkpragmatab.tcl 0e059aaab521b490c86ba3d4f945319b438558de7738e90f26c54f4ffcdd79bb
- F tool/mkshellc.tcl df5d249617f9cc94d5c48eb0401673eb3f31f383ecbc54e8a13ca3dd97e89450
+ F tool/mkshellc.tcl 02d0de8349ef830c0fb20d29680320bde2466e2ec422e5bd94c4317a7a7e8cc9
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
@@@ -2065,8 -2055,8 +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 fe44e7ef5387328f62c61e4482dbf63c3d1a4408baf20f3719d0ad344a3c714b ebbb1f88e7b5d6cbe84d400f1a187acedb4c668d0b7e4c63bf1496e57da9b8ad
- R e857145cf1775de14b9546cd8205c2b4
- U dan
- Z 5ee37fcc40d7329315d98af43dd4c020
 -P 1d81381e8f5db5d7064cc313b8544ca3cb1ca9e8cd61e71368a2d2e598befc9c
 -R 8d5e86d1a1bdc524e4c55f68c15dd1eb
 -U stephan
 -Z 3535ec90e400bedefa2bb2a3ed0778e8
++P 833f6374cc81a9b732bd852de6f98eef6c437f9fb18846e0022c6726324fab25 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
++R 20548f17ccb5c5c07ea43692a286d7f5
++U drh
++Z 0fd4751246a259e63474f8c0e15e9d17
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index f580b325ee,38754ac3fd..4a4c329e09
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 833f6374cc81a9b732bd852de6f98eef6c437f9fb18846e0022c6726324fab25
 -80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
++886788b61e227a5e821eb92e01aaeaf19b2e9412408a9c1a351c85546452a807