summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-11-02 09:22:36 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-11-02 09:22:36 -0200
commit1955c866243a2f125cbd8cdae271ee8d1a0fbeb6 (patch)
tree44690203a3656608198e5545931a3aa3ea667d31 /libmysql/libmysql.c
parent09c50b6303f887fc2d78b1f60b35fc76b5dbde96 (diff)
parentaca9b35ffe6e00fbe872607eca64fe5eff6d2293 (diff)
downloadmariadb-git-1955c866243a2f125cbd8cdae271ee8d1a0fbeb6.tar.gz
Automerge.
Diffstat (limited to 'libmysql/libmysql.c')
-rw-r--r--libmysql/libmysql.c12
1 files changed, 12 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)
{