bzr commit into mysql-5.1-bugteam branch (davi:3160)

[Davi Arnaut]

# At a local mysql-5.1-bugteam repository of davi

 3160 Davi Arnaut	2009-11-02 [merge]
      Automerge.

    modified:
      include/mysql.h
      include/mysql.h.pp
      libmysql/libmysql.c
      libmysql/libmysql.def
      libmysqld/libmysqld.def
=== modified file 'include/mysql.h'
--- a/include/mysql.h	2007-11-26 18:10:26 +0000
+++ b/include/mysql.h	2009-11-02 11:22:36 +0000
@@ -557,6 +557,16 @@ unsigned long STDCALL mysql_real_escape_
 					       char *to,const char *from,
 					       unsigned long length);
 void		STDCALL mysql_debug(const char *debug);
+char *		STDCALL mysql_odbc_escape_string(MYSQL *mysql,
+						 char *to,
+						 unsigned long to_length,
+						 const char *from,
+						 unsigned long from_length,
+						 void *param,
+						 char *
+						 (*extend_buffer)
+						 (void *, char *to,
+						  unsigned long *length));
 void 		STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);
 unsigned int	STDCALL mysql_thread_safe(void);
 my_bool		STDCALL mysql_embedded(void);

=== modified file 'include/mysql.h.pp'
--- a/include/mysql.h.pp	2008-08-08 09:00:05 +0000
+++ b/include/mysql.h.pp	2009-11-02 11:22:36 +0000
@@ -518,6 +518,16 @@ unsigned long mysql_real_escape_string(M
             char *to,const char *from,
             unsigned long length);
 void mysql_debug(const char *debug);
+char * mysql_odbc_escape_string(MYSQL *mysql,
+       char *to,
+       unsigned long to_length,
+       const char *from,
+       unsigned long from_length,
+       void *param,
+       char *
+       (*extend_buffer)
+       (void *, char *to,
+        unsigned long *length));
 void myodbc_remove_escape(MYSQL *mysql,char *name);
 unsigned int mysql_thread_safe(void);
 my_bool mysql_embedded(void);

=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2009-08-28 16:21:54 +0000
+++ b/libmysql/libmysql.c	2009-11-02 11:22:36 +0000
@@ -1629,6 +1629,18 @@ mysql_real_escape_string(MYSQL *mysql, c
   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)
 {

=== modified file 'libmysql/libmysql.def'
--- a/libmysql/libmysql.def	2007-11-26 18:10:26 +0000
+++ b/libmysql/libmysql.def	2009-11-02 11:22:36 +0000
@@ -78,6 +78,7 @@ EXPORTS
 	mysql_next_result
 	mysql_num_fields
 	mysql_num_rows
+	mysql_odbc_escape_string
 	mysql_options
 	mysql_stmt_param_count
 	mysql_stmt_param_metadata

=== modified file 'libmysqld/libmysqld.def'
--- a/libmysqld/libmysqld.def	2008-12-04 18:41:53 +0000
+++ b/libmysqld/libmysqld.def	2009-11-02 11:22:36 +0000
@@ -50,6 +50,7 @@ EXPORTS
 	mysql_next_result
 	mysql_num_fields
 	mysql_num_rows
+	mysql_odbc_escape_string
 	mysql_options
 	mysql_ping
 	mysql_query


Attachment: [text/bzr-bundle] bzr/[e-mail]