bzr commit into mysql-5.1 branch (sven:2698) Bug#36625

[Sven Sandberg]

#At file:///home/sven/bzr/debug-max/5.1/

 2698 Sven Sandberg	2008-11-06
      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.
removed:
  mysql-test/suite/rpl/r/rpl_redirect.result
  mysql-test/suite/rpl/t/rpl_redirect.test
modified:
  mysql-test/suite/rpl/t/disabled.def

per-file messages:
  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.
=== removed file 'mysql-test/suite/rpl/r/rpl_redirect.result'
--- a/mysql-test/suite/rpl/r/rpl_redirect.result	2007-06-27 12:29:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_redirect.result	1970-01-01 00:00:00 +0000
@@ -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;

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2008-10-07 15:32:58 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-11-06 10:00:55 +0000
@@ -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

=== removed file 'mysql-test/suite/rpl/t/rpl_redirect.test'
--- a/mysql-test/suite/rpl/t/rpl_redirect.test	2007-06-27 12:29:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_redirect.test	1970-01-01 00:00:00 +0000
@@ -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