bk commit into 5.1 tree (mkindahl:1.2535)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-05 13:31:57+01:00, mkindahl@stripped +1 -0
  Adding some more filtering for tests that kills queries and
  cause sporadic, but benign, errors.

  mysql-test/lib/mtr_report.pl@stripped, 2008-02-05 13:31:48+01:00, mkindahl@stripped +3 -2
    Filtering out sporadic but benign error in rpl_err_ignoredtable.

diff -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl	2008-02-05 08:22:11 +01:00
+++ b/mysql-test/lib/mtr_report.pl	2008-02-05 13:31:48 +01:00
@@ -375,11 +375,12 @@ sub mtr_report_stats ($) {
                   /Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452/
 		 )) or
 
-		# rpl_skip_error and binlog_killed_simulate produce an error which is skipped (slave does not stop)
+		# These tests does "kill" on queries, causing sporadic errors when writing to logs
 		(($testname eq 'rpl.rpl_skip_error' or
+		  $testname eq 'rpl.rpl_err_ignoredtable' or
 		  $testname eq 'binlog.binlog_killed_simulate' or
 		  $testname eq 'binlog.binlog_killed') and
-		 (/Failed to write to mysql\.general_log/
+		 (/Failed to write to mysql\.\w+_log/
 		 )) or
 
 		# rpl_temporary has an error on slave that can be ignored