diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 14:03:16 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 14:03:16 +0300 |
| commit | 258ec2ebaa706e34b7547a62898a638f3d92cae2 (patch) | |
| tree | f9052637897a910b3a182d1eb1a52f71e48806bf /libmysql | |
| parent | 13f1ace38bf7c66b1c3d78a4ef372058a3a4278e (diff) | |
| parent | 7d5e759907e55250749e79d35a8f1bc1b6b391ad (diff) | |
| download | mariadb-git-258ec2ebaa706e34b7547a62898a638f3d92cae2.tar.gz | |
Auto-merge from mysql-5.1.
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 |