From: drh <> Date: Sun, 1 Sep 2024 18:57:52 +0000 (+0000) Subject: Merge fixes from trunk into the ordere-set-agg branch. X-Git-Tag: version-3.47.0~158^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d5d6194c93d115630b0f640675525d9e3c4016e;p=thirdparty%2Fsqlite.git Merge fixes from trunk into the ordere-set-agg branch. FossilOrigin-Name: 7528ddcfdf155116353266e00e6408c526e29f04cb00ca2d9e84b105329b17c0 --- 5d5d6194c93d115630b0f640675525d9e3c4016e diff --cc manifest index 34c4430186,cec2fd4ce8..7827fc9c59 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Add\serror\schecking:\sDo\snot\sallow\sfunctions\sother\sthan\sthose\sin\sthe\npercentile\sextension\sto\suse\sthe\sordered-set\saggregate\snotation. - D 2024-08-31T22:22:24.013 -C Improved\ssort\sfunction\sin\sthe\spercentile\sextension. -D 2024-09-01T18:54:31.153 ++C Merge\sfixes\sfrom\strunk\sinto\sthe\sordere-set-agg\sbranch. ++D 2024-09-01T18:57:52.231 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@@ -410,7 -410,7 +410,7 @@@ F ext/misc/nextchar.c 7877914c2a80c2f18 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405 - F ext/misc/percentile.c 487b44e4f90674b1006e7309f22d37f4dedfa251b1f6e3e803dae56ceced14ee -F ext/misc/percentile.c 4560a3a42bab3d867060bb7e80a15fd82f917a58c87739591f0a3d99f18754a8 ++F ext/misc/percentile.c 98f7aab3607f6295b1c3168f763224e9de01a11c9c5c4cdd10f48418b89b52b4 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed @@@ -2211,8 -2211,8 +2211,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 ef9777890001ba0122d3add799795e118fd87243f42731ab84d4748b67605647 - R c9bceafb5aeb2174b63055fb2107e4ab -P 54313f74b24c46f1afa1ff082ef569fa46938527095be358015e7047e17702ac -R b41846f3df9dc87b92ce32e03786ab20 ++P 317d901429303340290334dbe7680a36339df0a50b586e3f71b6c5e5eba6d411 9f84e8d59bcda642e732565e840f6a880a01b2fc65af2651248f6a8a6e1cb65a ++R 5acc7ba4dfcfa66be05e9be878c8ce45 U drh - Z db0202ce7a6cda8a39ef6c63d39130ef -Z 1672856efafeb853be5cf9a4114de044 ++Z 02d4f1f356aa5a390460fc145367b9bc # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 81673bd417,888095dab4..1f6e329c93 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 317d901429303340290334dbe7680a36339df0a50b586e3f71b6c5e5eba6d411 -9f84e8d59bcda642e732565e840f6a880a01b2fc65af2651248f6a8a6e1cb65a ++7528ddcfdf155116353266e00e6408c526e29f04cb00ca2d9e84b105329b17c0