diff options
author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-13 13:26:16 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-13 13:26:16 +0100 |
commit | 63546824fc0d52ba86820b1d178dc537b5f718ee (patch) | |
tree | 5351c4626f402917a764b36f5e0825b90264f258 /libmysql | |
parent | 91916e7f054f4afd33bfda327a45589f2e2b7f16 (diff) | |
parent | 780871d8b90fe3146db39b4be65ebedb309b9f9b (diff) | |
download | mariadb-git-63546824fc0d52ba86820b1d178dc537b5f718ee.tar.gz |
automerge
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 14 | ||||
-rw-r--r-- | libmysql/libmysql.def | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index b8935333028..477830a6ebd 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1258,6 +1258,20 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, return (uint) escape_string_for_mysql(mysql->charset, to, 0, from, length); } + +char * STDCALL +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; +} + void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name) { diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index f6e93ca35fb..e435a14b005 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 |