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 | 2ca5b2c7916fe5312617aa992d5292e724af75f0 (patch) | |
| tree | 3fcae3d99a56ba99d825ae4457901d49e4b474e3 /libmysql/libmysql.c | |
| parent | 7a90f041cc3b6db8600e9469cab6d436653552ec (diff) | |
| parent | 26fc5583196f7b88256cb733be033757a0517266 (diff) | |
| download | mariadb-git-2ca5b2c7916fe5312617aa992d5292e724af75f0.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 12 |
1 files changed, 12 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) { |