From 7c3cb2c5d20ec659b7ebce3186195e8d1c1422e0 Mon Sep 17 00:00:00 2001 From: wenyuzifang Date: Thu, 4 Dec 2025 17:14:08 +0800 Subject: [PATCH] Update code from upstream --- mysql-c99.patch | 12 ++++++++++++ mysql.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 mysql-c99.patch diff --git a/mysql-c99.patch b/mysql-c99.patch new file mode 100644 index 0000000..935e64f --- /dev/null +++ b/mysql-c99.patch @@ -0,0 +1,12 @@ +diff -ur mysql-8.0.35.orig/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c mysql-8.0.35/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c +--- mysql-8.0.35.orig/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c 2023-10-12 13:45:01.000000000 +0200 ++++ mysql-8.0.35/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c 2023-12-19 10:48:46.718006624 +0100 +@@ -4070,7 +4070,7 @@ + do { + while(key_token->length != 0) { + /* whether there are more keys to fetch */ +- bool next_get = (key_token + 1)->value; ++ bool next_get = (key_token + 1)->value != NULL; + + key = key_token->value; + nkey = key_token->length; diff --git a/mysql.spec b/mysql.spec index 20fdbe0..0ca4464 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 # Name of the package without any prefixes %global pkg_name %{name} %global pkgnamepatch mysql @@ -122,6 +122,7 @@ Patch113: add-loongarch64-support-for-mysql.patch #add support for riscv64 Patch114: riscv-lock-free.patch +Patch115: %{pkgnamepatch}-c99.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -937,6 +938,10 @@ fi %endif %changelog +* Thu Dec 04 2025 Upstream Sync - 8.0.43-%{anolis_release} +- Sync upstream changes from commit unknown +- Applied upstream updates + * Tue Jul 29 2025 wenxin - 8.0.43-1 - update 8.0.43 - fix cve CVE-2025-50081 -- Gitee