From 35a0157fe860562402f3df28bc27590f2f9b6239 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 19 Dec 2023 11:31:58 +0100
Subject: [PATCH] Fix int-conversion type error in memcached (#2255206)

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>

Related: RHEL-22931
---
 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 ae948e2..4810e7c 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -145,7 +145,7 @@
 
 Name:             %{?scl_prefix}mysql
 Version:          8.0.35
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          2%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -193,6 +193,7 @@ Patch5:           %{pkgnamepatch}-paths.patch
 Patch51:          %{pkgnamepatch}-sharedir.patch
 Patch53:          %{pkgnamepatch}-mtr.patch
 Patch54:          %{pkgnamepatch}-arm32-timer.patch
+Patch55:          %{pkgnamepatch}-c99.patch
 
 # Patches specific for scl
 Patch90:          %{pkgnamepatch}-scl-env-check.patch
@@ -515,6 +516,7 @@ the MySQL sources.
 %patch51 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
 %patch126 -p1
 
 # Patch Boost
@@ -1205,6 +1207,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 19 2023 Florian Weimer <fweimer@redhat.com> - 8.0.35-2
+- Fix int-conversion type error in memcached
+
 * Thu Sep 21 2023 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.35-1
 - Update to MySQL 8.0.35
 - Remove patches now upstream