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

[Andrei Elkin]

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

 2661 Andrei Elkin	2008-06-16
      bug36968 rpl_temporary_errors
      
      Removing the global-wise suppression for deadlock error in favor of to use
      the per-test suppression.
      A test that is suppossed to generate an error in the error log needs to instruct
      mtr about is with a terminating line like:
      
        call mtr.add_supression("Error .*Deadlock found");
modified:
  mysql-test/include/mtr_warnings.sql

per-file comments:
  mysql-test/include/mtr_warnings.sql
    removing unnecessary global-wise suppression for deadlock error.
=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2008-04-24 11:26:28 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2008-06-16 10:53:57 +0000
@@ -134,7 +134,6 @@
  ("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"),