From: dan Date: Tue, 24 Sep 2024 15:43:52 +0000 (+0000) Subject: Merge trunk changes into this branch. X-Git-Tag: major-relase~109^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acfd1e2ba8db0cbfbec723648b229be1ffade2ee;p=thirdparty%2Fsqlite.git Merge trunk changes into this branch. FossilOrigin-Name: 9945206e6e26a48a49b9747650d299eb983cc21a3a61c621cd81f0bbc85a74d7 --- acfd1e2ba8db0cbfbec723648b229be1ffade2ee diff --cc manifest index 3fc85c61ed,5a40bbd21d..31fbff973a --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Fix\sthe\sfts5\sxInstToken()\sAPI\sfor\sprefix\squeries\sthat\sdo\snot\suse\sprefix-indexes.\sThis\sis\sexperimental. - D 2024-09-14T20:30:14.441 -C Fix\sa\smemory\sleak\sin\ssqlite3expert.c\sintroduced\sby\s[f1d76c86]. -D 2024-09-24T15:11:34.516 ++C Merge\strunk\schanges\sinto\sthis\sbranch. ++D 2024-09-24T15:43:52.339 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -2214,11 -2213,8 +2214,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P 50762ba0783a04e0dcd9456a1ae17d875b0a9272f2f09854a23d9d5253761e9f - R 7d932f341b9d462f57fdca7d1de99fb1 - T *branch * fts5-tokendata-prefix - T *sym-fts5-tokendata-prefix * - T -sym-trunk * -P f1d76c8636866424fe0b57d8814b8bb1a0ed4e2ca1b75d8e308d4b962ad8dc3b -R 3c493af72ec7c0caf9ac1da3817622db ++P 97c2824f471e7e622c4a166947a6e8162cae891345101539829a6fcec83373fe 42bb941584a1ac922ee6b0b6ecadce71c9259555563cf49913a6f820f3f9b887 ++R cb71c4478793484afa282b1a3cf11afa U dan - Z 82ecce364e38343eb4f3cc0cc45881c8 -Z 3984c94792299f2aa3da5c0fd5ebea46 ++Z efd6491e97a3bc8cd929e608bea6d1a9 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 77dd09f207,f9ccf18fa5..dc02877987 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 97c2824f471e7e622c4a166947a6e8162cae891345101539829a6fcec83373fe -42bb941584a1ac922ee6b0b6ecadce71c9259555563cf49913a6f820f3f9b887 ++9945206e6e26a48a49b9747650d299eb983cc21a3a61c621cd81f0bbc85a74d7