From: drh <>
Date: Sat, 26 Mar 2022 17:39:39 +0000 (+0000)
Subject: Merge the version 3.38.2 patches with the begin-concurrent-pnu-wal2 branch to
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=330cd8a6ac517b1dda30c2e0ffde023acb486c23;p=thirdparty%2Fsqlite.git

Merge the version 3.38.2 patches with the begin-concurrent-pnu-wal2 branch to
create this new sub-branch.

FossilOrigin-Name: 73a15377ef483a8969fc50e78121f407bb24815682bf2ef4ee0769a0afd123a2
---

330cd8a6ac517b1dda30c2e0ffde023acb486c23
diff --cc manifest
index 5a9359f6b9,f300e60e85..f071892bea
--- a/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\sversion\s3.38.0\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
- D 2022-02-22T19:56:17.371
 -C Version\s3.38.2
 -D 2022-03-26T13:51:10.240
++C Merge\sthe\sversion\s3.38.2\spatches\swith\sthe\sbegin-concurrent-pnu-wal2\sbranch\sto\ncreate\sthis\snew\ssub-branch.
++D 2022-03-26T17:39:39.465
  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 392c2f83569705069415a5d98b1c138ec8fe8a56a663a0d94cea019e806537b2
+ F VERSION 2c46bf3c621980e333221949b5ea8ce0bf5e6f0c328e6b228501ea3190abe467
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -497,12 -490,12 +497,12 @@@ F src/analyze.c 7518b99e07c5494111fe3bd
  F src/attach.c f26d400f3ffe2cdca01406bca70e5f58c5488bf165b4fc37c228136dfcf1b583
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
  F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 -F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 +F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 0b782485675f2d7923a11ea1354f708940c6edf2069aef3a3477df869263cde9
 -F src/btree.c 1ebe34ee736e05ead62bcf762a71c5779526356b0616dec67f20478d008e2eb4
 -F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 -F src/btreeInt.h 8be97d3939d626f734ec1b577efa4e6e186da00daf5b3227af199ca1c24cdd71
 -F src/build.c a0cc68fe8172c0a31b54576f9c6c0fe6f7c82b1b5e1387afdd6a5a13132bc131
++F src/btree.c 7536bfbbc73bab08b544907f9f795b48997ab051426729cd84f79a4362bf284f
 +F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
- F src/btreeInt.h 3f19f0be5af0b68cff55e58df4b11e7a0692d9e8a820ceaeba4084659a86cf28
- F src/build.c 54425e56359d4c197f7f2df4d8c26f6d3d6f5954fc6007448e19af20948b4f3c
++F src/btreeInt.h 96fad05b3a8f8345ed45491607b2149e4a94a8fbe9cdd3dc1431caba0cbfcd21
++F src/build.c e704ddc12cc83acb85e0f92ee38b164e067e5a1620fcc0989cb8a1e0910da443
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 2cce39df1a13e05b7633e6d21b651f21492471f991dd7b323a4ee4e7b7f0b7f1
@@@ -513,7 -506,7 +513,7 @@@ F src/delete.c b5f1716b4d723db48254ee0f
  F src/expr.c b90a029105a93a93a0ed5e5f8c5eaed8f19043a3b62e4c4d235a4611d9ada178
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 06e4ac33031b02dde7130c12e79cddf4dc5cfa72b23d8e63a3c26878fc9c1d3c
- F src/func.c 64e37fded60afe8af2ccea05ab7217dfee55100c0b0a9d777ba34111c0c5b6eb
 -F src/func.c a3407a6fbb0d4088d8d502e46f0ace63e0aeae7467ae23a9ca9815bbf9239761
++F src/func.c e0c6877153738cd42eec4f11385e7a14a63b8186ba87068b823200d3a9f71a48
  F src/global.c a3daa18a1696aadd94f18d37cbbdebf0bbdb827b8397a534f021cd56c15cd0f9
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@@ -543,28 -536,28 +543,28 @@@ F src/os.c b1c4f2d485961e9a5b6b648c3668
  F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c d38bf73a08bd1e721839fd9e4b5c67b10212d5ae44a28976d73e4e800d7d54ce
- F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
 -F src/os_unix.c df6142ed776b5e52c7c3106767283be2d510b63d72beb3b205898462f340a176
++F src/os_unix.c 676fe66fcabd7271db4f0e40286435805a990123e1191e572618123966b91bf2
+ F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 5522acd0b90e8016caa149f6eefe7653351b0b29c6933321671d045ae92d8ff2
 -F src/pager.c e4f4c1e07b2cc4fa44fc0bd51957ca6066f6b8c0b0e0388f11a6728b50d8f4e6
 -F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
 -F src/parse.y 0f02b27cdaa334441463153fff3ceb780fea006ab53ffd6ef566d4468f93e924
++F src/pager.c 039c50e6541574633dc21c5957d3e00654e849cf23dcfc81cccb0e0ce982f88e
 +F src/pager.h 034a193e53d6649bdb641aa996e38094dbb7cbe365d8c10eba871a38a0f5ebb3
 +F src/parse.y 34748e63f17252faa9b0176a912bf83bac2f02f1f18b027480cc1caaa4c88222
- F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
+ 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 a187dade741c1f09ae118fcbbf0302511807bfc0355880927d7152eb75b8260d
+ 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 3baa9dd8cf240654773c7974e2bcce398ac9dd24419c36684156963defe43b35
 +F src/select.c 9f660188fffb63b7fa5db8fcee791277a6307e43922d7765c26e8a0754b6423e
- F src/shell.c.in 14cdfba32c73cb06169e50cd448632c28359f2bab2a0f803dc4a7f46dfc5b6fa
- F src/sqlite.h.in c66db3391123df875daa637aaf426d31fcaceb35c418f3a6a0528773881ca0f7
+ F src/shell.c.in 69d1e59da4881f096ab47fbd3e6d99794f3e4a43f41fd9e4d2e845c9b8d20fd5
 -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 f08a7ce47a044aa86792878ceaa5d6b5e329f4fb9a69e02fd3cafbd85401cdb0
 -F src/sqliteInt.h e7b93bb693cb14259f6c3faadc6d7c824ff509aac673622a76c161a96c5872d0
++F src/sqliteInt.h e14fce3e17bb01b5d943626954e6a84e1ebf14aa2fc71b324f54a13f06f20211
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -625,32 -618,32 +625,32 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 6661a9fa660ecbd3ac0df1acd2ec788b3a8122b4316022bcdaf476ea6754a8de
  F src/treeview.c a84b57d15e46007d8b1ae249344b3f0b7f3c62def908b98baaa54935a57c8476
- F src/trigger.c 19fc6fe696a2409b04496df1ff044e6a942dad6ed3b6e897b1c9093b88cc2c62
+ F src/trigger.c 5fc3cde35cc4de510be68bb2db4dcff0ce0e1625f43e28a0920be9a6f010cd3f
 -F src/update.c f875b0d59da5c3055a0b2ac20560e1650229c6787e78de5e9836267b5cbb8359
 +F src/update.c 2d82c9785d73442ab3f0d729ef497e8e2ef9eb65394aaba24349671c697074c3
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 -F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
 -F src/vdbe.c 8239c69f3cb6fa27bac30d60c5a1ebac723abc007ff870ffc3af93e5159c7216
 +F src/vacuum.c 72867c740476d13f1c397015e4d3168b4e96a237a80b9afa67e1bb8500bfeeab
- F src/vdbe.c fb10f5843847732545cdf57a1c3cba41464dc5448cf7a82b4339640d532d9d7d
++F src/vdbe.c 198a24d3dfaac102d8cd68f97e67b4d3591b3c423c90a9674cd41a859210dcfd
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
  F src/vdbeInt.h b45599a2b59f1ce042512ab6786b0b82a8cf3002f6b0fa60b4834e2cd3ac61d8
  F src/vdbeapi.c 8863ffb5a7bac42fe9a68aaa3526ee29fc18fb02a9b27188b756de41e33856e9
 -F src/vdbeaux.c 0d7659fe8cb38ce86092b9bc5131c99a834a04eb78745e54acb77d79d7af2fb5
 +F src/vdbeaux.c d0fed930f5c63fd49c0e0f4e576e3fa03078614497154ebeb2e7aa2cdd144802
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c 7737f0b1c480a32b057849c804d2f21d5389649bb8be80f77ad75df700adc9a1
+ F src/vdbemem.c 69d3092d47b7a3a466a161961abd92bca7ab148abd8b497438eb17c6afdcbad8
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
- F src/vtab.c e0eaf5b8f7f8929088485a76bea2ff6124adb12e0eb5c0997287ff5e0e4c0517
+ F src/vtab.c 3d72c780d1ea08906a198e4f033921a658a54590e3ed72c544995d84f3f9464a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 -F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 +F src/wal.c 151479223abeaf4f9a4210f243a9a9ab4cccaa062855028a8c375b711b1d0611
 +F src/wal.h 7a733af13b966ecb81872ce397e862116b3575ea53245b90b139a2873ee87825
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c 0d75d7514764726409ea945520fe9fb515e7d9ae52a5a3c0a136142cfaa19087
+ F src/where.c 48d9836b7bdf301783719156fd50d45685a601605334035c559ed2d655df9fb6
  F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
- F src/wherecode.c 6150f51c0368be941fad90a736ce37cc1e2a719876750a3183a516ed256a4cbb
+ F src/wherecode.c 84be340684393248b9f3ecbce9b87c8a6f818149b52302702ea0b8d2a9d51faf
  F src/whereexpr.c 2a71f5491798460c9590317329234d332d9eb1717cba4f3403122189a75c465e
- F src/window.c dfaec4abc6012cbc18e4a202ca3a5d5a0efcc4011d86a06d882ddaab8aedee4d
+ F src/window.c 731980c0887f7ec9859f5e0d3c69d5fbeb6e512a9e1d338935f53938eaba431e
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
@@@ -1976,8 -1944,10 +1976,11 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 1336d2f23fcee5bc969cd5ca9e3be1458915e79365e21566ca2ba438f6df260b de24c8ee41007bc6d25d25856b64d8bdc4581666bca53eb031530b0e498fb0fe
- R ed6fa4c6d23cf4452713e16d348242ba
 -P 4977d8f453bcd56fb1dfab02cc5b283fb32d402bafdf2b6112e7dd322b7c32ad
 -R da11ed5f90621f5fb7c0aa8d0a45881c
 -T +sym-release *
 -T +sym-version-3.38.2 *
++P 8387e4f3af552322ed412e21948437bffc4cc237c5c5a80b558b8d395de4999d d33c709cc0af66bc5b6dc6216eba9f1f0b40960b9ae83694c986fbf4c1d6f08f
++R a7c9ecbd9be6db7dbb3ff706ab56c7b7
++T *branch * begin-concurrent-wal2-3.38
++T *sym-begin-concurrent-wal2-3.38 *
++T -sym-begin-concurrent-pnu-wal2 *
  U drh
- Z 73a286234d6208b714874fee1540117c
 -Z 1c2a1cc2a9288218f72e9d4db2ebcd7a
++Z 6a4a3304b228cba06f799d4f86d5cc60
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4a519a28ab,80822303ad..9040d47db8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8387e4f3af552322ed412e21948437bffc4cc237c5c5a80b558b8d395de4999d
 -d33c709cc0af66bc5b6dc6216eba9f1f0b40960b9ae83694c986fbf4c1d6f08f
++73a15377ef483a8969fc50e78121f407bb24815682bf2ef4ee0769a0afd123a2