From: drh <>
Date: Sat, 25 Jun 2022 16:43:31 +0000 (+0000)
Subject: Merge version 3.39.0 into the begin-concurrent-report branch.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70e7b60569ed257a34f8880da9e3f162518f9221;p=thirdparty%2Fsqlite.git

Merge version 3.39.0 into the begin-concurrent-report branch.

FossilOrigin-Name: 7726389cd50d5336d68c3c2717922b46c1674ccbf98b0e295b4331af7be8f7a7
---

70e7b60569ed257a34f8880da9e3f162518f9221
diff --cc manifest
index 04351132fd,4c2a0a8a90..e04f4a9e8b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\sversion\s3.39.0\srelease\scandidate\s1\schanges\sinto\sthe\nbegin-concurrent-report\sbranch.
- D 2022-06-24T15:04:44.186
 -C Merge\sversion\s3.39.0\sinto\sthe\sbegin\sconcurrent\sbranch.
 -D 2022-06-25T16:24:45.536
++C Merge\sversion\s3.39.0\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2022-06-25T16:43:31.625
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -648,13 -647,13 +648,13 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c 5b7888f917936dda09f98b1fda164cff1dad44fb5e143436bdbb9dc3191ce2df
 -F src/vdbe.c 2c7aaff87b2507fc7f6616dc49d6bced7c5b2ea5e40ed540ff69165bbbdcd1f5
 +F src/vdbe.c 492e9b2cf363629e107139cd8d21268aa31a92a6c445d85afd68e042235da8d7
  F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
 -F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
 -F src/vdbeapi.c 602610f1252d59cd69742f78a1e2f6fbae40a4b407f5506a6a7b869b0df08ff2
 -F src/vdbeaux.c b769bb218a5cf1a621e8cdb137937625d1159bef29edc6a78c349665a5f6161e
 +F src/vdbeInt.h b613abeebbdc4003926e175e5e7b8be6d20c34c874c3a3aa8703007e6d3a54fe
 +F src/vdbeapi.c cddd057e2f505f940f31f56cfe808c36c6e0c061c0a20c8b7c1301ebf84a541f
 +F src/vdbeaux.c b90acf28b176228d2004fa9b37e2d8344a3cdedf65b3540c91321bce63155d03
  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
@@@ -1996,8 -1994,8 +1996,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 8b446d0b85b66e8164e423bdc7f060f9b6cd854475d10bd41b820133b43e42f5 5ae706a401224581e370b934aa32fd8001f6597b6b38c45a75f13ed0c72b9118
- R 2d4bdda600c567c09c2251889808e8cc
 -P 5ae706a401224581e370b934aa32fd8001f6597b6b38c45a75f13ed0c72b9118 14e166f40dbfa6e055543f8301525f2ca2e96a02a57269818b9e69e162e98918
 -R fff2f45bfc459f28ec54154904e2198b
++P 1b28ad2caa3e43bd8011616edcafd15bdc6b4612afc43a024fc240ea85cb246e fb45624a319ed56268749d584839fa0a3c35d331513ca41451438dda988f9df8
++R 0dc06ae08e651aff0329e6b5bab620fb
  U drh
- Z 96eb0d4f1a9965cd2c9c2c17e7e3256c
 -Z 8dd8ec1cba5f1991739ddb0d5063478e
++Z 29b14e15e20507e7d997b7c7b6fb720c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 807c569d4f,fc39d09cf2..f8f16b41e9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1b28ad2caa3e43bd8011616edcafd15bdc6b4612afc43a024fc240ea85cb246e
 -fb45624a319ed56268749d584839fa0a3c35d331513ca41451438dda988f9df8
++7726389cd50d5336d68c3c2717922b46c1674ccbf98b0e295b4331af7be8f7a7