bzr commit into mysql-5.5-next-mr branch (alik:2937)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/00.merges/mysql-next-mr-merge/ based on
revid:alik@stripped

 2937 Alexander Nozdrin	2009-11-06 [merge]
      Auto-merge from mysql-trunk-merge.

    modified:
      libmysql/libmysql.c
      mysql-test/t/disabled.def
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2009-11-06 14:20:27 +0000
+++ b/libmysql/libmysql.c	2009-11-06 16:15:09 +0000
@@ -1260,12 +1260,14 @@ mysql_real_escape_string(MYSQL *mysql, c
 
 
 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 *))
+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;
 }

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-11-06 15:19:24 +0000
+++ b/mysql-test/t/disabled.def	2009-11-06 16:15:09 +0000
@@ -13,3 +13,5 @@ kill                     : Bug#37780 200
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb
changes
 partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb
changes
+innodb-autoinc           : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with
results difference
+rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2


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