From: drh <>
Date: Sat, 27 Nov 2021 15:00:54 +0000 (+0000)
Subject: Merge version 3.37.0 into the wal2 branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b90edad19d31c399d99e6d15dd5826d74ba7d55e;p=thirdparty%2Fsqlite.git

Merge version 3.37.0 into the wal2 branch.

FossilOrigin-Name: 3425af625bac6c89950a50c2a22c4b7f66b0080811fe16ec8879158420641d5c
---

b90edad19d31c399d99e6d15dd5826d74ba7d55e
diff --cc manifest
index bb129b9b6c,dfb723ab2a..7588404f42
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\strunk\senhancements\sinto\sthe\swal2\sbranch.
- D 2021-11-22T16:47:29.466
 -C Version\s3.37.0
 -D 2021-11-27T14:13:22.430
++C Merge\sversion\s3.37.0\sinto\sthe\swal2\sbranch.
++D 2021-11-27T15:00:54.793
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 0e91c42a1dd13a569b1fa4f4dfb7d3632f3164a1c05c71341533d67db5b641dd
 +F Makefile.in f05f45ead829c1c49b8f016022c133276c0eda5498e04dfeefc27720007d9b2e
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 1f9a608925602339e7e9e542659f36255ceec5f1e0803d08b062f0351c88fd4e
 -F Makefile.msc 88f05063ee36a5fb77d69b877ef824d0743b5325c95bfbf74d6ff17bd1c9fb1f
++F Makefile.msc 3f6e8e2d1461acf7837481eceb6e9b3d88677e50f94a9c2c265a3e1ff9f19640
  F README.md 27fb76aa7eb57ed63a53bbba7292b6bf71f51125554f79f16b5d040edd1e6110
  F VERSION c6595fef606851f2bc3ebed6a7386c73751835fc909feab7c093739fa4b3c1d1
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -493,10 -491,10 +493,10 @@@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa2
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
  F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c 13b965a0f3cd57221e3b4e61e24452ec264a5b163de347b03b5039ddcd95cd54
 +F src/btree.c 645d1259dd49b2c53089fdd5652e49b990f134d0932ef6955cac03eca225b674
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
  F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
- F src/build.c 1b41a6417e5bb260a5988588764863229905b07b3e9a47878030a1c92d49010f
+ F src/build.c c46bd4f5a69f398410c4472f7c1c4291fb8078d2c9758a2dad5916edd1d30ecc
  F src/callback.c 106b585da1edd57d75fa579d823a5218e0bf37f191dbf7417eeb4a8a9a267dbc
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
@@@ -636,8 -634,8 +636,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 b4b8fa75897fe5229cc30725345db656e122b65c394dfc5d279bf49e422481ed
 -F src/wal.c ed0398a7adf02c31e34aada42cc86c58f413a7afe5f741a5d373ad087abde028
 -F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
++F src/wal.c ebd6d4c0e47a752a4f38fa486bf7243d2af1a8323b5a98c4a1dacdc590d87716
 +F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
  F src/where.c de0d4ff409c7b62a8803f9f267cc2c7fedddbc00de9ab7b5382c507383c18665
  F src/whereInt.h 83877a75a1bce056ea44aff02f1dfa958ad1d6038c213ddadb8652003b45151d
@@@ -1945,7 -1933,10 +1945,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 0894f59569378c41207b6cef43dbff9a4873582709d954c809c18f42d918aa03 eff4187c50790827d05bb28867cc6546196e7eee3b4c4de54b4e68bfb4e2830e
- R 29df751e9d2b3dd5633493dc71bda55f
 -P 7c567338ae4dd31097e9ae5c693b84369c35c5a52534797e8186b4be7297ba78
 -R 1bdaa083fa0abfc53c61429627c688f2
 -T +sym-major-release *
 -T +sym-release *
 -T +sym-version-3.37.0 *
++P 135133b7a65c652e95b0642bc2358425af72e46b1b6b64d256547b5e5e8f7e41 bd41822c7424d393a30e92ff6cb254d25c26769889c1499a18a0b9339f5d6c8a
++R 201b14339f58661bd2f967a1bd6734d2
  U drh
- Z e98452ac933a4d5454c2583c02071760
 -Z 6f6dbee10adfe1c5275055f73bc6984f
++Z 71b7d59afa12a68b678449df3fa88a69
diff --cc manifest.uuid
index c0405e6b91,44318ef9d2..62aa877b1a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 135133b7a65c652e95b0642bc2358425af72e46b1b6b64d256547b5e5e8f7e41
 -bd41822c7424d393a30e92ff6cb254d25c26769889c1499a18a0b9339f5d6c8a
++3425af625bac6c89950a50c2a22c4b7f66b0080811fe16ec8879158420641d5c