Strip warning in rpl_deadlock_innodb

This commit is contained in:
Honza Horák 2013-06-14 08:32:55 +02:00 committed by Michal Schorm
parent c8c1b8c56c
commit 3a4491d3c8
2 changed files with 22 additions and 0 deletions

View File

@ -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

View File

@ -62,6 +62,7 @@ Patch23: community-mysql-sharedir.patch
Patch24: community-mysql-man-pages.patch Patch24: community-mysql-man-pages.patch
Patch25: community-mysql-tmpdir.patch Patch25: community-mysql-tmpdir.patch
Patch26: community-mysql-cve-2013-1861.patch Patch26: community-mysql-cve-2013-1861.patch
Patch27: community-mysql-innodbwarn.patch
BuildRequires: perl, readline-devel, openssl-devel BuildRequires: perl, readline-devel, openssl-devel
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@ -246,6 +247,7 @@ the MySQL sources.
%patch24 -p1 %patch24 -p1
%patch25 -p1 %patch25 -p1
%patch26 -p1 %patch26 -p1
%patch27 -p1
# workaround for upstream bug #56342 # workaround for upstream bug #56342
rm -f mysql-test/t/ssl_8k_key-master.opt rm -f mysql-test/t/ssl_8k_key-master.opt