From b7f04d0c6c551bfe11a33e2bf98e737fd9e55174 Mon Sep 17 00:00:00 2001
From: Andrei Elkin <aelkin@mysql.com>
Date: Mon, 25 Aug 2008 15:40:44 +0300
Subject: [PATCH] Bug #36968 rpl_temporary_errors.test produces warning in
 pushbuild

Backporting fixes to 5.1 from 6.0.

mysql-test/include/mtr_warnings.sql:
  removing the global rule for deadlock, use per-test intead.
mysql-test/suite/rpl/r/rpl_temporary_errors.result:
  deploying the expected deadlock error suppression in the test.
mysql-test/suite/rpl/t/rpl_temporary_errors.test:
  deploying the expected deadlock error suppression in the test.
---
 mysql-test/include/mtr_warnings.sql                | 1 -
 mysql-test/suite/rpl/r/rpl_temporary_errors.result | 1 +
 mysql-test/suite/rpl/t/rpl_temporary_errors.test   | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index 5c359693bd7..8343683bf55 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -134,7 +134,6 @@ INSERT INTO global_supressions VALUES
  ("Slave: According to the master's version"),
  ("Slave: Column [0-9]* type mismatch"),
  ("Slave: Error .* doesn't exist"),
- ("Slave: Error .*Deadlock found"),
  ("Slave: Error .*Unknown table"),
  ("Slave: Error in Write_rows event: "),
  ("Slave: Field .* of table .* has no default value"),
diff --git a/mysql-test/suite/rpl/r/rpl_temporary_errors.result b/mysql-test/suite/rpl/r/rpl_temporary_errors.result
index 430e63c5859..75fbf187fd3 100644
--- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result
+++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result
@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+call mtr.add_supression("Deadlock found");
 **** On Master ****
 SET SESSION BINLOG_FORMAT=ROW;
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT);
diff --git a/mysql-test/suite/rpl/t/rpl_temporary_errors.test b/mysql-test/suite/rpl/t/rpl_temporary_errors.test
index f38ed29f7d4..d557566acf9 100644
--- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test
@@ -1,5 +1,7 @@
 source include/master-slave.inc;
 
+call mtr.add_supression("Deadlock found");
+
 --echo **** On Master ****
 connection master;
 SET SESSION BINLOG_FORMAT=ROW;