merge

4 files changed, 0 insertions, 26 deletions

diff --git a/libmysql/.cvsignore b/libmysql/.cvsignore
deleted file mode 100644
index a58235fee47..00000000000
--- a/libmysql/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
-conf_to_src
-config.status
-configure
-ctype_extra_sources.c
-libmysqlclient.la
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index a2ccd8f340d..6277fec2bda 100755
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -76,7 +76,6 @@ mysql_more_results
 mysql_next_result
 mysql_num_fields
 mysql_num_rows
-mysql_odbc_escape_string
 mysql_options
 mysql_stmt_param_count
 mysql_stmt_param_metadata
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index c4f16527551..46bbe9b4aa6 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1258,20 +1258,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)
 {
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def
index a32f501d756..ce85d2a4086 100644
--- a/libmysql/libmysql.def
+++ b/libmysql/libmysql.def
@@ -52,7 +52,6 @@ EXPORTS
 	mysql_next_result
 	mysql_num_fields
 	mysql_num_rows
-	mysql_odbc_escape_string
 	mysql_options
 	mysql_stmt_param_count
 	mysql_stmt_param_metadata