diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
| commit | 7cd11f45beeb162db84dea423a040a296ac2856e (patch) | |
| tree | 3fcae3d99a56ba99d825ae4457901d49e4b474e3 /libmysql | |
| parent | 5462a6dbcc68d51a89356255fb4f398be7d62c27 (diff) | |
| parent | 3e2c9aac11a95d8cbb61e1937e4ebe18c7e86698 (diff) | |
| download | mariadb-git-7cd11f45beeb162db84dea423a040a296ac2856e.tar.gz | |
Manual merge from mysql-trunk-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 56a2e492226..d5fbbc192f2 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1258,6 +1258,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 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 |