push into mysql-6.0 branch (aelkin:2660 to 2661) Bug#36968

[Andrei Elkin]

------------------------------------------------------------
revno: 2661
revision-id: aelkin@stripped
parent: aelkin@stripped
committer: Andrei Elkin <aelkin@stripped>
branch nick: 6.0-bug36968-rpl_temporary_errors_warn
timestamp: Mon 2008-06-16 13:53:57 +0300
message:
  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
sp1f-mtr_warnings.sql-20080408145123-lhtlr627ins6hwi3hxjrcytx4t27nyjr
------------------------------------------------------------
revno: 2660
revision-id: aelkin@stripped
parent: aelkin@stripped
committer: Andrei Elkin <aelkin@stripped>
branch nick: 6.0-bug36968-rpl_temporary_errors_warn
timestamp: Mon 2008-06-16 12:50:23 +0300
message:
  bug#36968 rpl_temporary_errors
  
  Adding the Deadlock error suppression to the test file.
modified:
  mysql-test/suite/rpl/r/rpl_temporary_errors.result
sp1f-rpl_temporary_errors-20071020181608-xundxvrjaumpxwejukituoslcc42my7p
  mysql-test/suite/rpl/t/rpl_temporary_errors.test
sp1f-rpl_temporary_errors-20071020181608-od3xavonaky32wsy7gbvwomesyi5fiye
=== 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"),

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