From ff40ccb8d79a57cea93d3b739b29ccaab0f421ef Mon Sep 17 00:00:00 2001
From: "mkindahl@dl145h.mysql.com" <>
Date: Mon, 4 Feb 2008 07:15:14 +0100
Subject: [PATCH] Masking out some more errors and warnings that are benign.

---
 mysql-test/include/delete_anonymous_users.inc |  2 ++
 mysql-test/lib/mtr_report.pl                  | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mysql-test/include/delete_anonymous_users.inc b/mysql-test/include/delete_anonymous_users.inc
index 9f642223748..704e74ae4a3 100644
--- a/mysql-test/include/delete_anonymous_users.inc
+++ b/mysql-test/include/delete_anonymous_users.inc
@@ -1,5 +1,7 @@
 # Remove anonymous users added by add_anonymous_users.inc
+disable_warnings;
 disable_query_log;
 DELETE FROM mysql.user where host='localhost' and user='';
 FLUSH PRIVILEGES;
 enable_query_log;
+enable_warnings;
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index ad7142489fe..37863ce4187 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -375,9 +375,16 @@ sub mtr_report_stats ($) {
                   /Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452/
 		 )) or
 
-		# rpl_skip_error produce an error which is skipped (slave does not stop)
-		($testname eq 'rpl.rpl_skip_error' and
-		 /Failed to write to mysql\.general_log/)
+		# rpl_skip_error and binlog_killed_simulate produce an error which is skipped (slave does not stop)
+		(($testname eq 'rpl.rpl_skip_error' or
+		  $testname eq 'binlog.binlog_killed_simulate') and
+		 (/Failed to write to mysql\.general_log/
+		 )) or
+
+		# rpl_temporary has an error on slave that can be ignored
+		($testname eq 'rpl.rpl_temporary' and
+		 (/Slave: Can\'t find record in \'user\' Error_code: 1032/
+		 ))
 		)
             {
               next;                       # Skip these lines