From 482997ea654a340ac323aef2906441f95330110c Mon Sep 17 00:00:00 2001
From: "mkindahl@dl145h.mysql.com" <>
Date: Tue, 19 Feb 2008 19:59:48 +0100
Subject: [PATCH] Removing deliberately generated errors for rpl_bug33931 test
 and moving test to replication suite.

---
 mysql-test/lib/mtr_report.pl                        | 5 +++++
 mysql-test/{ => suite/rpl}/r/rpl_bug33931.result    | 0
 mysql-test/{ => suite/rpl}/t/rpl_bug33931-slave.opt | 0
 mysql-test/{ => suite/rpl}/t/rpl_bug33931.test      | 0
 4 files changed, 5 insertions(+)
 rename mysql-test/{ => suite/rpl}/r/rpl_bug33931.result (100%)
 rename mysql-test/{ => suite/rpl}/t/rpl_bug33931-slave.opt (100%)
 rename mysql-test/{ => suite/rpl}/t/rpl_bug33931.test (100%)

diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index ecfdc00eaf9..2aeda9933f0 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -383,6 +383,11 @@ sub mtr_report_stats ($) {
 		 (/Failed to write to mysql\.\w+_log/
 		 )) or
 
+		# rpl_bug33931 has deliberate failures
+		($testname eq 'rpl.rpl_bug33931' and
+		 (/Failed during slave.*thread initialization/
+		  )) 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/
diff --git a/mysql-test/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result
similarity index 100%
rename from mysql-test/r/rpl_bug33931.result
rename to mysql-test/suite/rpl/r/rpl_bug33931.result
diff --git a/mysql-test/t/rpl_bug33931-slave.opt b/mysql-test/suite/rpl/t/rpl_bug33931-slave.opt
similarity index 100%
rename from mysql-test/t/rpl_bug33931-slave.opt
rename to mysql-test/suite/rpl/t/rpl_bug33931-slave.opt
diff --git a/mysql-test/t/rpl_bug33931.test b/mysql-test/suite/rpl/t/rpl_bug33931.test
similarity index 100%
rename from mysql-test/t/rpl_bug33931.test
rename to mysql-test/suite/rpl/t/rpl_bug33931.test