From: drh <>
Date: Sat, 27 Nov 2021 15:11:55 +0000 (+0000)
Subject: Merge version 3.37.0 into the begin-concurrent-pnu-wal2 branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbe42de14f684072ddd41728c4845056ffd167c8;p=thirdparty%2Fsqlite.git

Merge version 3.37.0 into the begin-concurrent-pnu-wal2 branch.

FossilOrigin-Name: 2171996a02ad2ec571570749ccee421bc0859a690c8393c5edda6cf164d2c8db
---

dbe42de14f684072ddd41728c4845056ffd167c8
diff --cc manifest
index 6f1e7e7417,7588404f42..a0a0be1778
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\strunk\senhancements\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
- D 2021-11-22T17:01:50.378
 -C Merge\sversion\s3.37.0\sinto\sthe\swal2\sbranch.
 -D 2021-11-27T15:00:54.793
++C Merge\sversion\s3.37.0\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
++D 2021-11-27T15:11:55.095
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in f05f45ead829c1c49b8f016022c133276c0eda5498e04dfeefc27720007d9b2e
 +F Makefile.in 51fc06b371261469b0e18b61533fc8b523fedf0096bcacdf5afac96b65c58e88
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 1f9a608925602339e7e9e542659f36255ceec5f1e0803d08b062f0351c88fd4e
+ F Makefile.msc 3f6e8e2d1461acf7837481eceb6e9b3d88677e50f94a9c2c265a3e1ff9f19640
  F README.md 27fb76aa7eb57ed63a53bbba7292b6bf71f51125554f79f16b5d040edd1e6110
  F VERSION c6595fef606851f2bc3ebed6a7386c73751835fc909feab7c093739fa4b3c1d1
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -496,12 -491,12 +496,12 @@@ F src/analyze.c 7518b99e07c5494111fe3bd
  F src/attach.c e3f9d9a2a4a844750f3f348f37afb244535f21382cbfcd840152cb21cb41cfaf
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 -F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 +F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c 645d1259dd49b2c53089fdd5652e49b990f134d0932ef6955cac03eca225b674
 -F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 -F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
 -F src/build.c c46bd4f5a69f398410c4472f7c1c4291fb8078d2c9758a2dad5916edd1d30ecc
 +F src/btree.c 5943ec18ac160ade910bb7b59470b5cd53b66eaf2dcc40fecdc1c5c285be0bfc
 +F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 +F src/btreeInt.h 3f19f0be5af0b68cff55e58df4b11e7a0692d9e8a820ceaeba4084659a86cf28
- F src/build.c f0cd84c6186df95fb679471ff8a52ecf6dba4df340891755b2e28a89128a732f
++F src/build.c 7b4705bfa97af3845573aa1530ff5ca992e60b84ad018115e23bbf0c0559318f
  F src/callback.c 106b585da1edd57d75fa579d823a5218e0bf37f191dbf7417eeb4a8a9a267dbc
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
@@@ -509,10 -504,10 +509,10 @@@ F src/date.c fa928630fecf1d436cdc7a7a5c
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
  F src/delete.c 0c151975fa99560767d7747f9b60543d0093d9f8b89f13d2d6058e9c83ad19e7
- F src/expr.c 89c4a225af2ccf5e7f1d53a70170c405036c63cc55130467e013ec9553261cb1
+ F src/expr.c 4b6dfb224b6234ff4f529023993b503048e1b045ff49cbb911e7d28a28cca795
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 187b67af20c5795953a592832c5d985e4313fe503ebd8f95e3e9e9ad5a730bb5
 -F src/func.c 1cfb09d7ffca81238eccefdb0293e1f5b7cfebbd1816dfad5ec6024742a7496b
 +F src/func.c a5dce8a8ff85310e2c88262a25bcded0a7e92be9a4bda24bbf6eab78e99c2f13
  F src/global.c 1f56aead86e8a18c4415638f5e6c4d0a0550427f4b3f5d065ba5164cc09c22e8
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@@ -551,23 -546,23 +551,23 @@@ F src/pcache.c 084e638432c610f95aea72b8
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
  F src/pragma.c cb0cc54e1ae56082f6eabc4c0013ee3fd31844bda83e9c5aaf95616572db2439
 -F src/pragma.h 87330ed2fbfa2a1274de93ca0ab850fba336189228cb256089202c3b52766fad
 +F src/pragma.h f98354c48571c490927029510566839bf9e7242569bfbb48032dafeb008481d2
  F src/prepare.c 7520a371f1de8a53e3023eba75bc0d3473196833c6363d285cad8d002eabef0b
  F src/printf.c 5901672228f305f7d493cbc4e7d76a61a5caecdbc1cd06b1f9ec42ea4265cf8d
 -F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 +F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
  F src/resolve.c 4a1db4aadd802683db40ca2dbbb268187bd195f10cbdb7206dbd8ac988795571
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 9e70ca5f5836527faaf62f8cce5429f9096ad593606be297eaabcb4c4f0ef057
 -F src/select.c a7a3d9f54eb24821ec5f67f2e5589b68a5d42d46fc5849d7376886777d93a85a
++F src/select.c 7e8082835f8b8891a0785dc163724a13b5c200abd0931fd3204b2578339c49bc
  F src/shell.c.in 975f268ef261773fcbed1e519dfa10c4f33e8b1cffc12120563e61857fff07c6
 -F src/sqlite.h.in 5cd209ac7dc4180f0e19292846f40440b8488015849ca0110c70b906b57d68f0
 +F src/sqlite.h.in 32f7d112cb85d3f2fd56500e11a6bd6d19a969306650200dcde97c2638cfecfc
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8ff2fd2c166150b2e48639f5e506fb44e29f1a3f65031710b9e89d1c126ac839
- F src/sqliteInt.h b0ce438fc450ef014eef794652bf60579863bea0767a200f6470958b1e33cba7
 -F src/sqliteInt.h 193e716a67c877a6054a8c261c932bdc64f8c8be9b66388c74f21d94a259b7ce
++F src/sqliteInt.h fb84d6eaa6fb1fc408065d137d79838e93e1ee2a72ea45d77aa0c2d5801be716
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 50c2b759f4a918e41ed7a038baaef087ff264c7b3adddf39741315a53fd92e47
+ F src/tclsqlite.c 48f291e1a7e672a7204884d4c164a8ed3a522ff087c361ada2991f5d54e987f6
 -F src/test1.c d6c945a8bb211ed72ea515f0b9743caeaf38c66da6418a7b1dcf3764e1368bbb
 +F src/test1.c 2785b6fd05e4810f7215bf8de01c15670f39a19e49e3d927045f5e72ab08b4cd
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
@@@ -641,8 -636,8 +641,8 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
  F src/vtab.c 9d5c3f49d3a6959b6eef287bb8fa773563102a80a835c3314c57144412709e78
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c ae1ac0b2c5ca25fadff417cec4b55876ba21c52b6d0ed6ddd5a1b6975a668bcd
 -F src/wal.c ebd6d4c0e47a752a4f38fa486bf7243d2af1a8323b5a98c4a1dacdc590d87716
 -F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
++F src/wal.c 8a81802f21762b63d0100ff240f983adcd1cb3807fc8cf73deafcd8268483e6b
 +F src/wal.h 7a733af13b966ecb81872ce397e862116b3575ea53245b90b139a2873ee87825
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
  F src/where.c de0d4ff409c7b62a8803f9f267cc2c7fedddbc00de9ab7b5382c507383c18665
  F src/whereInt.h 83877a75a1bce056ea44aff02f1dfa958ad1d6038c213ddadb8652003b45151d
@@@ -1964,7 -1945,7 +1964,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 07bc13395de3e45fec2cd571f1c9d0776e198768a4a0dd00479347ca8058a003 135133b7a65c652e95b0642bc2358425af72e46b1b6b64d256547b5e5e8f7e41
- R eb327e0d087bf66bbc00895572c09aab
 -P 135133b7a65c652e95b0642bc2358425af72e46b1b6b64d256547b5e5e8f7e41 bd41822c7424d393a30e92ff6cb254d25c26769889c1499a18a0b9339f5d6c8a
 -R 201b14339f58661bd2f967a1bd6734d2
++P 8a9fad0f71135b0218ccddeabb7db0c41cfac08ec772f8b3b1df7751485bc30a 3425af625bac6c89950a50c2a22c4b7f66b0080811fe16ec8879158420641d5c
++R 0a90a070d8addea4d9c4ecfd9760de90
  U drh
- Z eadf3a18efed763e5c3c89d4d929d333
 -Z 71b7d59afa12a68b678449df3fa88a69
++Z 64736bb5cbda5070d127800560ceb017
diff --cc manifest.uuid
index 3c661af87c,62aa877b1a..61faa6e268
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8a9fad0f71135b0218ccddeabb7db0c41cfac08ec772f8b3b1df7751485bc30a
 -3425af625bac6c89950a50c2a22c4b7f66b0080811fe16ec8879158420641d5c
++2171996a02ad2ec571570749ccee421bc0859a690c8393c5edda6cf164d2c8db