From: drh <>
Date: Tue, 22 Feb 2022 19:46:57 +0000 (+0000)
Subject: Merge version 3.38.0 into the wal2 branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=981dcb623637aa00680d63773d1c3bbd69d7cee3;p=thirdparty%2Fsqlite.git

Merge version 3.38.0 into the wal2 branch.

FossilOrigin-Name: de24c8ee41007bc6d25d25856b64d8bdc4581666bca53eb031530b0e498fb0fe
---

981dcb623637aa00680d63773d1c3bbd69d7cee3
diff --cc manifest
index 6b26e5ac01,5ca957c244..cfc3ccd831
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\srecent\strunk\senhancements\sinto\sthe\swal2\sbranch.
- D 2022-02-15T20:37:36.975
 -C Version\s3.38.0
 -D 2022-02-22T18:58:40.488
++C Merge\sversion\s3.38.0\sinto\sthe\swal2\sbranch.
++D 2022-02-22T19:46:57.046
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in bf74279877c734a0de7670b8ad2e624947e9eee3b9662bbc3fc86ac77c40f5c5
 -F Makefile.in b210ad2733317f1a4353085dfb9d385ceec30b0e6a61d20a5accabecac6b1949
++F Makefile.in d131e5632811fec684198fd7f579463d81b01048df48a55ec92584c538190f81
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc fe098b3b2d7b8cc41fc8ffa41550ba09d61c1d6a09cb57d473fcf87b95868572
 -F Makefile.msc b28a8a7a977e7312f6859f560348e1eb110c21bd6cf9fab0d16537c0a514eef3
++F Makefile.msc f969c28231012e50ee07c5062ee1dd5bbfc00883d52573af44b4fd477ec63843
  F README.md 2dd87a5c1d108b224921f3dd47dea567973f706e1f6959386282a626f459a70c
  F VERSION 392c2f83569705069415a5d98b1c138ec8fe8a56a663a0d94cea019e806537b2
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -475,7 -473,7 +475,7 @@@ F ext/userauth/userauth.c 7f00cded7dcaa
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 0d69ab4feff254acadea5ce66f5f7c7061652a57a1538a240d70af13dbb31823
 -F main.mk 80ac3d2f82eb21c6fb4423f9c7f8e207abb51be6676845a00e246cfb22f9c77c
++F main.mk 50dac6249cce84aca4a365127a771b0a32247b151d64752997cc679660e0c3c4
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -494,10 -492,10 +494,10 @@@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa2
  F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
  F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c 117808943727d27e38c69de4e79237e52c89ee40f6f1a70de4e6e14b5e596cbc
 +F src/btree.c f7a4f869f4414ebbd72abf257a461cc89d41c6a885fccdc807051d99f52ec981
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
  F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
- F src/build.c b59ff41525c10b429adc277d3bca6e433b09d055b0df8c1529385763cea8bb04
+ F src/build.c 9891c2160886cf7e344d7e8f1f7177f9612916c7c67ffeacd64cb34a92d387a8
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 2cce39df1a13e05b7633e6d21b651f21492471f991dd7b323a4ee4e7b7f0b7f1
@@@ -626,7 -624,7 +626,7 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
- F src/vdbe.c 1e9bdd1343e3e333e2fb97ef19b6e86295b7b6669241ab26041c2328d5920fea
 -F src/vdbe.c e179d2d6551c6cc3dda7f6f233f9fe3d3c8da2f9bfc46eaabb4b54dc4337d3cf
++F src/vdbe.c 5d48a02416ab6ae9ff6c45f5724c042fd67a50da7c76675a3d4da41325ceeebc
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
  F src/vdbeInt.h b45599a2b59f1ce042512ab6786b0b82a8cf3002f6b0fa60b4834e2cd3ac61d8
  F src/vdbeapi.c 8863ffb5a7bac42fe9a68aaa3526ee29fc18fb02a9b27188b756de41e33856e9
@@@ -1957,8 -1944,10 +1957,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 d2de02f372a07b10e21f56fc49755545e7c8c889a9527bf3818e5e65cb33bb80 9edaeed56f2282fd4da935454178c38ab49d259aed96d4e720aae09050a53006
- R b0a602b2f5215e680c54c851c61eb1c4
 -P 7e3c9594390ac8defaf9825e14b4c19ef8c123b747971dd3d4df16110f443d3b
 -R 2222d568cabc2aa5ac864df535d62eb2
 -T +sym-release *
 -T +sym-version-3.38.0 *
++P 7dba818893fb898e4556bb7ed9cb0dc5667b19a3d7969c7d35c902d2bf5450b1 40fa792d359f84c3b9e9d6623743e1a59826274e221df1bde8f47086968a1bab
++R dcdfeb38651c1c0cc0c8a961db6ac639
  U drh
- Z 92a3bf61cd054960abfabd4577b6b1d3
 -Z 2297eaa4fd3e9ed1fd7ae8af6c650431
++Z fca5cbe2fad256a175cc663c54f30622
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a5dc21e54c,b9b6e8d9ec..8fbd42c7f0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7dba818893fb898e4556bb7ed9cb0dc5667b19a3d7969c7d35c902d2bf5450b1
 -40fa792d359f84c3b9e9d6623743e1a59826274e221df1bde8f47086968a1bab
++de24c8ee41007bc6d25d25856b64d8bdc4581666bca53eb031530b0e498fb0fe