diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-09-29 09:55:53 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-09-29 09:55:53 -0300 |
| commit | aca9b35ffe6e00fbe872607eca64fe5eff6d2293 (patch) | |
| tree | 9f27d633325188fc4fb5d168282898d3c8b9c795 /libmysql | |
| parent | 7f9656369f97803bb10a1111f60d60db295b82a4 (diff) | |
| download | mariadb-git-aca9b35ffe6e00fbe872607eca64fe5eff6d2293.tar.gz | |
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.
include/mysql.h:
Restore mysql_odbc_escape_string prototype.
include/mysql_h.ic:
Update ABI check.
libmysql/libmysql.c:
Restore a mysql_odbc_escape_string stub.
libmysql/libmysql.def:
Restore mysql_odbc_escape_string.
libmysqld/libmysqld.def:
Restore mysql_odbc_escape_string.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 12 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 1 |
2 files changed, 13 insertions, 0 deletions
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) { diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 81f86dc8726..8c6b71d9553 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -78,6 +78,7 @@ EXPORTS mysql_next_result mysql_num_fields mysql_num_rows + mysql_odbc_escape_string mysql_options mysql_stmt_param_count mysql_stmt_param_metadata |