From f68e75498464088b75d9e3a039c1aac6f98cf0cf Mon Sep 17 00:00:00 2001
From: Sven Sandberg <sven.sandberg@oracle.com>
Date: Sun, 19 Dec 2010 18:16:01 +0100
Subject: [PATCH] Disabled part of rpl_change_master that fails sporadically
because of BUG#59037.
---
mysql-test/suite/rpl/r/rpl_change_master.result | 14 --------------
mysql-test/suite/rpl/t/rpl_change_master.test | 2 ++
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/mysql-test/suite/rpl/r/rpl_change_master.result b/mysql-test/suite/rpl/r/rpl_change_master.result
index fc9cce177da..6674ab168ef 100644
--- a/mysql-test/suite/rpl/r/rpl_change_master.result
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result
@@ -15,18 +15,4 @@ n
1
2
drop table t1;
-include/rpl_reset.inc
-create table t1 (a int);
-insert into t1 values (1);
-flush logs;
-insert into t1 values (2);
-include/stop_slave.inc
-delete from t1 where a=2;
-CHANGE MASTER TO relay_log_file='slave-relay-bin.000005', relay_log_pos=4;
-start slave sql_thread;
-include/wait_for_slave_sql_to_start.inc
-start slave io_thread;
-include/wait_for_slave_io_to_start.inc
-set global relay_log_purge=1;
-drop table t1;
include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_change_master.test b/mysql-test/suite/rpl/t/rpl_change_master.test
index 2fcc208c471..c31359a84d8 100644
--- a/mysql-test/suite/rpl/t/rpl_change_master.test
+++ b/mysql-test/suite/rpl/t/rpl_change_master.test
@@ -52,6 +52,7 @@ sync_slave_with_master;
# BUG#12190 CHANGE MASTER has differ path requiremts on MASTER_LOG_FILE and RELAY_LOG_FILE
#
+if ($bug_59037_is_fixed == 'true') {
--source include/rpl_reset.inc
connection master;
@@ -97,5 +98,6 @@ source include/wait_for_slave_io_to_start.inc;
eval set global relay_log_purge=$relay_log_purge;
connection master;
drop table t1;
+}
--source include/rpl_end.inc
--
2.30.9