From 344cd04b1ec15b8ccea834381b4668f86d6822d5 Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Tue, 29 Sep 2009 09:55:53 -0300 Subject: Bug#41728: Dropped symbol but no soname change Restore a stub of the removed mysql_odbc_escape_string function to fix a ABI breakage. The function was intended to be private and used only by Connector/ODBC, but, unfortunately, it was exported as part of the ABI. Nonetheless, only a stub is restored as the original function is inherently broken and shouldn't be used. This restoration only applies to MySQL 5.0. This will be addressed differently in later versions -- reworked library versioning. --- libmysql/libmysql.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'libmysql/libmysql.c') diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 1fa3181b1be..92a90ba79b3 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1613,6 +1613,18 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, return escape_string_for_mysql(mysql->charset, to, 0, from, length); } + +char * STDCALL +mysql_odbc_escape_string(MYSQL *mysql, + char *to, ulong to_length, + const char *from, ulong from_length, + void *param, + char * (*extend_buffer) + (void *, char *, ulong *)) +{ + return NULL; +} + void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name) { -- cgit v1.2.1 From fc55339e2f4ef58a1ee2841bbb5019353165c818 Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Tue, 3 Nov 2009 16:17:06 -0200 Subject: Fix compiler warnings -- tag unused parameters. --- libmysql/libmysql.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'libmysql/libmysql.c') diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 92a90ba79b3..d287679bebb 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1615,12 +1615,14 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, char * STDCALL -mysql_odbc_escape_string(MYSQL *mysql, - char *to, ulong to_length, - const char *from, ulong from_length, - void *param, - char * (*extend_buffer) - (void *, char *, ulong *)) +mysql_odbc_escape_string(MYSQL *mysql __attribute__((unused)), + char *to __attribute__((unused)), + ulong to_length __attribute__((unused)), + const char *from __attribute__((unused)), + ulong from_length __attribute__((unused)), + void *param __attribute__((unused)), + char * (*extend_buffer)(void *, char *, ulong *) + __attribute__((unused))) { return NULL; } -- cgit v1.2.1