From: drh <>
Date: Wed, 4 May 2022 16:36:43 +0000 (+0000)
Subject: Merge the version 3.38.4 fixes into the begin-concurrent-wal2-3.38 branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7aadf70d826347e4cd971ccd7696c0f0bd19979;p=thirdparty%2Fsqlite.git

Merge the version 3.38.4 fixes into the begin-concurrent-wal2-3.38 branch.

FossilOrigin-Name: 8473718d19114b21b1a7bde389474f923172da2336f536365210e4943439ffad
---

f7aadf70d826347e4cd971ccd7696c0f0bd19979
diff --cc manifest
index b5dd56eca1,f78bf8af27..6fd9a2dcb1
--- a/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\sversion\s3.38.3\sfixes\sonto\sthe\sbegin-concurrent-wal2-3.38\sbranch.
- D 2022-04-27T13:00:26.773
 -C Version\s3.38.4
 -D 2022-05-04T15:45:55.565
++C Merge\sthe\sversion\s3.38.4\sfixes\sinto\sthe\sbegin-concurrent-wal2-3.38\sbranch.
++D 2022-05-04T16:36:43.489
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in b210ad2733317f1a4353085dfb9d385ceec30b0e6a61d20a5accabecac6b1949
 +F Makefile.in 66e765adf2ecedc7c41389eb120246786ef5b8c58a6eda20d54edb388bde80ba
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 -F Makefile.msc b28a8a7a977e7312f6859f560348e1eb110c21bd6cf9fab0d16537c0a514eef3
 +F Makefile.msc f969c28231012e50ee07c5062ee1dd5bbfc00883d52573af44b4fd477ec63843
  F README.md 2dd87a5c1d108b224921f3dd47dea567973f706e1f6959386282a626f459a70c
- F VERSION b09048f5104cef7fbc4405635ec966be2481d532c0dbd46afd5c17f957de2dc0
+ F VERSION 01b4df68a6266aba3e9ddaee2431393b03fd9c7f9a1f972640618f91bb743a4c
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -552,19 -545,19 +552,19 @@@ F src/parse.y 34748e63f17252faa9b0176a9
  F src/pcache.c 0aab73936341fad83d107cf62c6a7bc2d2d5fb9aaec8c3ce61e19fc18e4560fc
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
 -F src/pragma.c 7c024d690a3dc93f61830f11f900e4af2357f31d081b0c79099ca5e28919cba7
 -F src/pragma.h 87330ed2fbfa2a1274de93ca0ab850fba336189228cb256089202c3b52766fad
 +F src/pragma.c cb52183ed4fe56c806323f84576bf50306bd42104addaf7f4375195f13635dc3
 +F src/pragma.h f98354c48571c490927029510566839bf9e7242569bfbb48032dafeb008481d2
  F src/prepare.c fd940149c691684e7c1073c3787a7170e44852b02d1275d2e30a5b58e89cfcaf
  F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32
 -F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 +F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
  F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 -F src/select.c ba0cd3d264fa788c8d65f063d5ec3e1d65b0dac206c822a564a59ba550210cfc
 +F src/select.c fdb54f5185882260151eb3b64c42b1347549f124d27562edcd62a05f0d64f22b
- F src/shell.c.in ec4b952f7d9c02919e8e8394be16bcbff55c105fd080895602d10fc8fa5328b8
+ F src/shell.c.in 1060fa0c4d585fb40f3473d7175c05ea81b0909a304de7216ae7b97bf0e5845f
 -F src/sqlite.h.in b93deee892f1bc4030e5c8712df9e21d786a1bf8e921ab8dc987eaf1e44c676f
 +F src/sqlite.h.in 1a77fc9f3e5432bd057b73e73a2571b94e596142cef3dd1a03224ad39927a32b
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a95cb9ed106e3d39e2118e4dcc15a14faec3fa50d0093425083d340d9dfd96e6
 -F src/sqliteInt.h 272c5ca0a16a1963c0c956524c615a27af57be950b97a395d39cb9fd9b31fc4e
 +F src/sqliteInt.h 81f9fe2e2ff433b2817514bedd989f61c4d47659bcfc4190c958288b1e11f844
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -630,8 -623,8 +630,8 @@@ F src/update.c 2d82c9785d73442ab3f0d729
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 -F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
 -F src/vdbe.c dafb1c9c2f58555bf6f384fe049a4b4fc2408b500216b37769f8faa82a46e57a
 +F src/vacuum.c 72867c740476d13f1c397015e4d3168b4e96a237a80b9afa67e1bb8500bfeeab
- F src/vdbe.c 198a24d3dfaac102d8cd68f97e67b4d3591b3c423c90a9674cd41a859210dcfd
++F src/vdbe.c 1aca09e63ae6fb15b411540e062e42ec6d74772b070947b15e9a238a7d1ba057
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
  F src/vdbeInt.h b45599a2b59f1ce042512ab6786b0b82a8cf3002f6b0fa60b4834e2cd3ac61d8
  F src/vdbeapi.c 8863ffb5a7bac42fe9a68aaa3526ee29fc18fb02a9b27188b756de41e33856e9
@@@ -1976,8 -1944,10 +1976,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 73a15377ef483a8969fc50e78121f407bb24815682bf2ef4ee0769a0afd123a2 9547e2c38a1c6f751a77d4d796894dec4dc5d8f5d79b1cd39e1ffc50df7b3be4
- R a54bb4f9de8fad1e4af897a314f0786d
 -P 4f83c442c9b34abc292566b9547d3bd265e7a5e9662472fd6498faa22aafdd24
 -R cfa691fad1c1b13c897954002fcae77c
 -T +sym-release *
 -T +sym-version-3.38.4 *
++P 5590f0a4e6eabf58166a342f1893cf26524d6358330bef1f0aa4bec5ce6058d4 d402f49871152670a62f4f28cacb15d814f2c1644e9347ad7d258e562978e45e
++R a97b65be1458f3ad48af18a6fa11798f
  U drh
- Z b3c47398a1c3bc04bf0db4393aa02461
 -Z 5aa4cf8764f337c9398ac713b67bacc1
++Z 58d8e650554d8712b401ce8a613fe6d7
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 6e44cafd92,1f08204e4b..51abd91335
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5590f0a4e6eabf58166a342f1893cf26524d6358330bef1f0aa4bec5ce6058d4
 -d402f49871152670a62f4f28cacb15d814f2c1644e9347ad7d258e562978e45e
++8473718d19114b21b1a7bde389474f923172da2336f536365210e4943439ffad