35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
|
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)
|