From: drh <>
Date: Sat, 25 Jun 2022 17:08:25 +0000 (+0000)
Subject: Merge version 3.39.0 into the begin-concurrent-pnu-wal2 branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acf11ef4435ed22829672128f59cc1ec4659ddda;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: 09cfef38daa791c2ba114fcf960436322c5acde312234b2c5105c3d95b6c1337
---

acf11ef4435ed22829672128f59cc1ec4659ddda
diff --cc manifest
index 186f33f2e5,3b4e819139..9839cb02f7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\schanges\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
- D 2022-06-24T15:26:30.415
 -C Merge\sversion\s3.39.0\sinto\sthe\swal2\sbranch.
 -D 2022-06-25T16:53:36.816
++C Merge\sversion\s3.39.0\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
++D 2022-06-25T17:08:25.541
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -654,9 -648,9 +654,9 @@@ F src/vdbe.c 5233a61eca350db4750589964a
  F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
  F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
  F src/vdbeapi.c 602610f1252d59cd69742f78a1e2f6fbae40a4b407f5506a6a7b869b0df08ff2
 -F src/vdbeaux.c 328b866880e67526300aa2361c5e50beb3d97dd8746db37dd4aa0135aea60e4d
 +F src/vdbeaux.c b769bb218a5cf1a621e8cdb137937625d1159bef29edc6a78c349665a5f6161e
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c 3db315458f8dc158aff58719795441437dd6c0fd302e9d9379a8f2a61e185ad6
+ F src/vdbemem.c 5ebf05c0182addedb1607ade848e1c83cef40981df94d1abfab0c59288c6064f
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@@ -2012,8 -1991,8 +2012,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 82e7e836011f52c09196aa6af9519cd9f584881d41dcbcdb23969e863c6e4fb0 5a5e6e368f5cc8fe7cf29696a07942101f5c114084d4117acf277bb3ad8555ac
- R 6af1fb267b559ac13ca3f5eec3a5395b
 -P 5a5e6e368f5cc8fe7cf29696a07942101f5c114084d4117acf277bb3ad8555ac 14e166f40dbfa6e055543f8301525f2ca2e96a02a57269818b9e69e162e98918
 -R e5fc911f0a86748145e1da0886462030
++P d3fa692179fb2e704e22f1fa0a64152bd0d6d6b531e359fa038eecf909373d97 ad3a7005e704711fb9de9e96883db3aed82c4f132a66cb74daf67c2527d79f73
++R 2fdb6eee279557a448a7092c530a5c13
  U drh
- Z 55e96386371c2ffe4430229f65340003
 -Z 1da384b15e9d7950d5559005e2984b62
++Z 8186556c8d69c75aa7307dee637a1388
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4436d38010,5360f63fdd..bbd95b2498
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d3fa692179fb2e704e22f1fa0a64152bd0d6d6b531e359fa038eecf909373d97
 -ad3a7005e704711fb9de9e96883db3aed82c4f132a66cb74daf67c2527d79f73
++09cfef38daa791c2ba114fcf960436322c5acde312234b2c5105c3d95b6c1337