From: drh <> Date: Sat, 25 Jun 2022 16:24:45 +0000 (+0000) Subject: Merge version 3.39.0 into the begin concurrent branch. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf5696ff0b906cc55e4313e446bbc089565a23b7;p=thirdparty%2Fsqlite.git Merge version 3.39.0 into the begin concurrent branch. FossilOrigin-Name: fb45624a319ed56268749d584839fa0a3c35d331513ca41451438dda988f9df8 --- cf5696ff0b906cc55e4313e446bbc089565a23b7 diff --cc manifest index 51878d8cb9,e662e1ccf3..4c2a0a8a90 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\s3.39.0\srelease\scandidate\s1\schanges\sinto\sthe\sbegin-concurrent\sbranch. - D 2022-06-24T14:55:19.368 -C Version\s3.39.0 -D 2022-06-25T14:57:57.276 ++C Merge\sversion\s3.39.0\sinto\sthe\sbegin\sconcurrent\sbranch. ++D 2022-06-25T16:24:45.536 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -651,9 -646,9 +651,9 @@@ F src/vdbe.c 2c7aaff87b2507fc7f6616dc49 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 @@@ -1994,8 -1978,11 +1994,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 221e07ed783b878c0148feb57aaee0b80ee5567d9176b3ddb8dd853e02a9d08b e93fd170ce4ae91d572c46d03f68f55d00091d0188030517455017d90d212587 - R 8d0a95bf24c4f013a4a7a8e0221c877c -P cd6254fcd32798f7be4e6d827597ddaa2e46ac6e2f0149cd3a3be0416fa18835 -R 4b3e64a86ee9acaa4f97f1ab6ad6f3ae -T +sym-major-release * -T +sym-release * -T +sym-version-3.39.0 * ++P 5ae706a401224581e370b934aa32fd8001f6597b6b38c45a75f13ed0c72b9118 14e166f40dbfa6e055543f8301525f2ca2e96a02a57269818b9e69e162e98918 ++R fff2f45bfc459f28ec54154904e2198b U drh - Z a2c989390f2ef296c84c665d5f8198b2 -Z f64bfe891f96e530fe80668f0f22f84a ++Z 8dd8ec1cba5f1991739ddb0d5063478e # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index ee6b839797,03a3b1ba34..fc39d09cf2 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 5ae706a401224581e370b934aa32fd8001f6597b6b38c45a75f13ed0c72b9118 -14e166f40dbfa6e055543f8301525f2ca2e96a02a57269818b9e69e162e98918 ++fb45624a319ed56268749d584839fa0a3c35d331513ca41451438dda988f9df8