From f40fc60cf233fe3c82aeaf7da4d29fa83e600b00 Mon Sep 17 00:00:00 2001
From: Sven Sandberg <sven@mysql.com>
Date: Thu, 6 Nov 2008 11:00:55 +0100
Subject: [PATCH] BUG#36625: Please remove the rpl_probe and rpl_parse features
 from the server Problem 1: BUG#36625: rpl_redirect doesn't do anything
 useful. It tests an obsolete feature that was never fully implemented. Fix 1:
 Remove rpl_redirect. Problem 2: rpl_innodb_bug28430 and rpl_flushlog_loop are
 disabled despite the bugs for which they were disabled have been fixed. Fix
 2: Re-enable rpl_innodb_bug28430 and rpl_flushlog_loop.

mysql-test/suite/rpl/r/rpl_redirect.result:
  Removed result file for obsolete test.\
mysql-test/suite/rpl/t/disabled.def:
  Re-enabled tests.
mysql-test/suite/rpl/t/rpl_redirect.test:
  Removed obsolete test.
---
 mysql-test/suite/rpl/r/rpl_redirect.result | 40 -------------------
 mysql-test/suite/rpl/t/disabled.def        |  3 --
 mysql-test/suite/rpl/t/rpl_redirect.test   | 45 ----------------------
 3 files changed, 88 deletions(-)
 delete mode 100644 mysql-test/suite/rpl/r/rpl_redirect.result
 delete mode 100644 mysql-test/suite/rpl/t/rpl_redirect.test

diff --git a/mysql-test/suite/rpl/r/rpl_redirect.result b/mysql-test/suite/rpl/r/rpl_redirect.result
deleted file mode 100644
index 39a7cb3ac3b..00000000000
--- a/mysql-test/suite/rpl/r/rpl_redirect.result
+++ /dev/null
@@ -1,40 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-SHOW SLAVE STATUS;
-SHOW SLAVE HOSTS;
-Server_id	Host	Port	Rpl_recovery_rank	Master_id
-2	127.0.0.1	SLAVE_PORT	2	1
-create table t1 ( n int);
-insert into t1 values (1),(2),(3),(4);
-insert into t1 values(5);
-SELECT * FROM t1 ORDER BY n;
-n
-1
-2
-3
-4
-5
-SELECT * FROM t1 ORDER BY n;
-n
-1
-2
-3
-4
-SELECT * FROM t1 ORDER BY n;
-n
-1
-2
-3
-4
-SELECT * FROM t1 ORDER BY n;
-n
-1
-2
-3
-4
-5
-drop table t1;
diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
index ebdb8014f88..8cae44a3607 100644
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/mysql-test/suite/rpl/t/disabled.def
@@ -10,6 +10,3 @@
 #
 ##############################################################################
 
-rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)
-rpl_innodb_bug28430        : Failure on Solaris Bug #36793
-rpl_flushlog_loop          : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main
diff --git a/mysql-test/suite/rpl/t/rpl_redirect.test b/mysql-test/suite/rpl/t/rpl_redirect.test
deleted file mode 100644
index 1c6f31a030e..00000000000
--- a/mysql-test/suite/rpl/t/rpl_redirect.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Test of automatic redirection of queries to master/slave.
-# 
-
-source include/master-slave.inc;
-# We disable this for now as PS doesn't handle redirection
---disable_ps_protocol
-
-#first, make sure the slave has had enough time to register
-save_master_pos;
-connection slave;
-sync_with_master;
-
-#discover slaves
-connection master;
-source include/show_slave_status.inc;
---replace_result $SLAVE_MYPORT SLAVE_PORT
-SHOW SLAVE HOSTS;
-rpl_probe;
-
-#turn on master/slave query direction auto-magic
-enable_rpl_parse;
-create table t1 ( n int);
-insert into t1 values (1),(2),(3),(4);
-disable_rpl_parse;
-save_master_pos;
-connection slave;
-sync_with_master;
-insert into t1 values(5);
-connection master;
-enable_rpl_parse;
-# The first of the queries will be sent to the slave, the second to the master.
-SELECT * FROM t1 ORDER BY n;
-SELECT * FROM t1 ORDER BY n;
-disable_rpl_parse;
-SELECT * FROM t1 ORDER BY n;
-connection slave;
-SELECT * FROM t1 ORDER BY n;
-
-# Cleanup
-connection master;
-drop table t1;
-sync_slave_with_master;
-
-# End of 4.1 tests