summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-11-24 19:25:23 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-11-24 19:25:23 -0200
commit6cfe31e382ac5fb22eada408dc37eb368536a592 (patch)
treede192332ac9c771c0738e3a88ce93e6af3b52183 /libmysql/libmysql.c
parent18448bc05c2780a31fedbaec475d41dacff7ba75 (diff)
downloadmariadb-git-6cfe31e382ac5fb22eada408dc37eb368536a592.tar.gz
Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 and up.
Diffstat (limited to 'libmysql/libmysql.c')
-rw-r--r--libmysql/libmysql.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 77ff2a01d7c..1264f2765ba 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1629,20 +1629,6 @@ 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 __attribute__((unused)),
- char *to __attribute__((unused)),
- ulong to_length __attribute__((unused)),
- const char *from __attribute__((unused)),
- ulong from_length __attribute__((unused)),
- void *param __attribute__((unused)),
- char * (*extend_buffer)(void *, char *, ulong *)
- __attribute__((unused)))
-{
- return NULL;
-}
-
void STDCALL
myodbc_remove_escape(MYSQL *mysql,char *name)
{