[community-mysql] Strip warning in rpl_deadlock_innodb

[Honza Horak]

commit 9f8a8f3631775ee129d6ce9a37b6ac67cf736cd2
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri Jun 14 08:32:55 2013 +0200

    Strip warning in rpl_deadlock_innodb

 community-mysql-innodbwarn.patch |   20 ++++++++++++++++++++
 community-mysql.spec             |    2 ++
 2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/community-mysql-innodbwarn.patch b/community-mysql-innodbwarn.patch
new file mode 100644
index 0000000..c513442
--- /dev/null
+++ b/community-mysql-innodbwarn.patch
@@ -0,0 +1,20 @@
+Test case rpl.rpl_daedlock_innodb fails when dropping tables because some
+warnings are generated in the slave server. The test is working fine when
+running alone, but fails when all tests are running, so it seems not to be
+so bad thing to ignore that warnings.
+
+http://bugs.mysql.com/bug.php?id=69458
+
+diff -up mysql-5.5.32/mysql-test/include/mtr_warnings.sql.innodbwarn mysql-5.5.32/mysql-test/include/mtr_warnings.sql
+--- mysql-5.5.32/mysql-test/include/mtr_warnings.sql.innodbwarn	2013-06-13 16:45:27.723525133 +0200
++++ mysql-5.5.32/mysql-test/include/mtr_warnings.sql	2013-06-13 16:46:24.879524133 +0200
+@@ -162,6 +162,9 @@ INSERT INTO global_suppressions VALUES
+  ("InnoDB: Error: in RENAME TABLE table `test`.`t1`"),
+  ("InnoDB: Error: table `test`.`t[123]` does not exist in the InnoDB internal"),
+ 
++ /* rpl.rpl_deadlock_innodb fails when trying DROP tables */
++ ("InnoDB: Error: table `mysqld.2`.`#sql.*` does not exist in the InnoDB internal"),
++
+  /*
+    BUG#32080 - Excessive warnings on Solaris: setrlimit could not
+    change the size of core files
diff --git a/community-mysql.spec b/community-mysql.spec
index f08367d..63af6dd 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -62,6 +62,7 @@ Patch23: community-mysql-sharedir.patch
 Patch24: community-mysql-man-pages.patch
 Patch25: community-mysql-tmpdir.patch
 Patch26: community-mysql-cve-2013-1861.patch
+Patch27: community-mysql-innodbwarn.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -246,6 +247,7 @@ the MySQL sources.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt