rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix int-conversion type error in memcached (#2255206)

Browse Source 
Related to:

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

Related: RHEL-22453
This commit is contained in:
Florian Weimer 2023-12-19 11:31:58 +01:00 committed by Honza Horak
parent 768cfb9f8c
commit e38d49bb14
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-c99.patch Normal file
View File

@ -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;

7
mysql.spec
View File

@ -75,7 +75,7 @@
Name: mysql Name: mysql
Version: 8.0.35 Version: 8.0.35
Release: 1%{?with_debug:.debug}%{?dist} Release: 2%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com URL: http://www.mysql.com
@ -117,6 +117,7 @@ Patch51: %{pkgnamepatch}-sharedir.patch
Patch52: %{pkgnamepatch}-rpath.patch Patch52: %{pkgnamepatch}-rpath.patch
Patch53: %{pkgnamepatch}-mtr.patch Patch53: %{pkgnamepatch}-mtr.patch
Patch54: %{pkgnamepatch}-arm32-timer.patch Patch54: %{pkgnamepatch}-arm32-timer.patch
Patch55: %{pkgnamepatch}-c99.patch
# Patches taken from boost 1.59 # Patches taken from boost 1.59
Patch111: boost-1.58.0-pool.patch Patch111: boost-1.58.0-pool.patch
@ -389,6 +390,7 @@ the MySQL sources.
%patch -P52 -p1 %patch -P52 -p1
%patch -P53 -p1 %patch -P53 -p1
%patch -P54 -p1 %patch -P54 -p1
%patch -P55 -p1
# Patch Boost # Patch Boost
pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
@ -981,6 +983,9 @@ fi
%endif %endif
%changelog %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 * Thu Sep 21 2023 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.35-1
- Update to MySQL 8.0.35 - Update to MySQL 8.0.35
- Remove patches now upstream - Remove patches now upstream