Automerging

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"),

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);

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;