Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.

Also merge charset patch.

1 files changed, 14 insertions, 0 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 3a62208fd92..768a62ea8b8 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1642,6 +1642,20 @@ 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)
 {