rpms/mariadb
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert upstream change to mysql_get_client breaking libqt5 5.15.2 [release 10.6.3-2mamba;Tue Jul 27 2021]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 06:57:49 +01:00
parent c4d644c1ba
commit beb55b97ac
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mariadb-10.6.3-revert-mysql_get_client-change.patch Normal file
View File

@ -0,0 +1,34 @@
From a37b7c3965706f9a062baaba0c494dd6efb2c306 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Mon, 31 May 2021 12:44:51 +0200
Subject: [PATCH] CONC-509: mysql_get_client* api functions should return C/C
version.
Instead of server version the api functions mysql_get_client_info and
mysql_get_client_version should return MARIADB_PACKAGE_VERSION/ID.
---
libmariadb/mariadb_lib.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 3fb9d0b2..e4baff33 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -2946,7 +2946,7 @@ mysql_get_proto_info(MYSQL *mysql)
const char * STDCALL
mysql_get_client_info(void)
{
- return (char*) MARIADB_CLIENT_VERSION_STR;
+ return (char*) MARIADB_PACKAGE_VERSION;
}
static size_t get_store_length(size_t length)
@@ -3968,7 +3968,7 @@ int STDCALL mysql_set_server_option(MYSQL *mysql,
ulong STDCALL mysql_get_client_version(void)
{
- return MARIADB_VERSION_ID;
+ return MARIADB_PACKAGE_VERSION_ID;
}
ulong STDCALL mysql_hex_string(char *to, const char *from, unsigned long len)

9
mariadb.spec
View File

@ -6,7 +6,7 @@
Name: mariadb Name: mariadb
Version: 10.6.3 Version: 10.6.3
Release: 1mamba Release: 2mamba
Summary: A SQL database engine designed as a drop-in replacement of MySQL(R) Summary: A SQL database engine designed as a drop-in replacement of MySQL(R)
Group: Applications/Databases Group: Applications/Databases
Vendor: openmamba Vendor: openmamba
@ -17,6 +17,7 @@ Source: https://mirror.one.com/mariadb/mariadb-%{version}/source/mariadb-
Source1: mariadb.service Source1: mariadb.service
Source2: mariadb-tmpfile.conf Source2: mariadb-tmpfile.conf
Source3: mariadb-logrotate Source3: mariadb-logrotate
Patch1: mariadb-10.6.3-revert-mysql_get_client-change.patch
Patch2: mariadb-10.5.9-fix-cmake-ConnectorName-syntax.patch Patch2: mariadb-10.5.9-fix-cmake-ConnectorName-syntax.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
@ -151,7 +152,8 @@ This package contains the development header files and libraries necessary to de
%setup -q %setup -q
#-D -T #-D -T
#:<< _EOF #:<< _EOF
#%patch2 -p1 cd libmariadb
%patch1 -p1 -R
%build %build
%cmake -d build \ %cmake -d build \
@ -650,6 +652,9 @@ fi
%{_mandir}/man3/mysql_*.3* %{_mandir}/man3/mysql_*.3*
%changelog %changelog
* Tue Jul 27 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 10.6.3-2mamba
- revert upstream change to mysql_get_client breaking libqt5 5.15.2
* Sun Jul 18 2021 Automatic Build System <autodist@mambasoft.it> 10.6.3-1mamba * Sun Jul 18 2021 Automatic Build System <autodist@mambasoft.it> 10.6.3-1mamba
- automatic version update by autodist - automatic version update by autodist