commit into mysql-6.0 branch (aelkin:2660) Bug#36968

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/6.0-bug36968-rpl_temporary_errors_warn/

 2660 Andrei Elkin	2008-06-16
      bug#36968 rpl_temporary_errors
      
      Adding the Deadlock error suppression to the test file.
modified:
  mysql-test/suite/rpl/r/rpl_temporary_errors.result
  mysql-test/suite/rpl/t/rpl_temporary_errors.test

per-file comments:
  mysql-test/suite/rpl/r/rpl_temporary_errors.result
    results changed
  mysql-test/suite/rpl/t/rpl_temporary_errors.test
    deploying a suppression of a benign error that the test generates.
=== modified file 'mysql-test/suite/rpl/r/rpl_temporary_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2008-02-06 17:31:05 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2008-06-16 09:50:23 +0000
@@ -81,3 +81,4 @@
 DROP TABLE t1;
 **** On Master ****
 DROP TABLE t1;
+call mtr.add_supression("Slave: Deadlock found");

=== 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-06-16 09:50:23 +0000
@@ -29,3 +29,5 @@
 --echo **** On Master ****
 connection master;
 DROP TABLE t1;
+
+call mtr.add_supression("Slave: Deadlock found");