diff options
author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-03 01:52:57 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-03 01:52:57 +0100 |
commit | 7d5e759907e55250749e79d35a8f1bc1b6b391ad (patch) | |
tree | 4c9faaf0a5cffc8b04abfd8c697396fa72259b5f /libmysql | |
parent | 2f075a1e37a483833e6f7e2de4bd3f9b1848082c (diff) | |
parent | fa6c23832c6fd6c544a04d8a70f01838d451a4b0 (diff) | |
download | mariadb-git-7d5e759907e55250749e79d35a8f1bc1b6b391ad.tar.gz |
merge
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 1264f2765ba..7d717ee084d 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1629,6 +1629,18 @@ 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, + 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 |