bzr commit into mysql-5.1 branch (aelkin:2661) Bug#36968

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/MERGE/5.1-rpl/

 2661 Andrei Elkin	2008-08-25
      Bug #36968 rpl_temporary_errors.test produces warning in pushbuild
      
      Backporting fixes to 5.1 from 6.0.
modified:
  mysql-test/include/mtr_warnings.sql
  mysql-test/suite/rpl/r/rpl_temporary_errors.result
  mysql-test/suite/rpl/t/rpl_temporary_errors.test

per-file messages:
  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.
=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2008-08-09 09:29:35 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2008-08-25 12:40:44 +0000
@@ -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"),

=== modified file 'mysql-test/suite/rpl/r/rpl_temporary_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2008-01-14 07:38:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2008-08-25 12:40:44 +0000
@@ -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);

=== modified file 'mysql-test/suite/rpl/t/rpl_temporary_errors.test'
--- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test	2008-01-14 09:54:23 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test	2008-08-25 12:40:44 +0000
@@ -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;