From ec079876519ffc501af97050371b88ca2f35b857 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Wed, 14 Jun 2006 21:46:41 +0200
Subject: [PATCH] Remove opt_old_master, using a 4.0 mysqld with
 mysql-test-run.pl from 5.1 is not supported

---
 mysql-test/mysql-test-run.pl | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 07622bccdf9..2b10d572618 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -248,8 +248,6 @@ our $opt_ndbconnectstring;
 our $opt_ndbcluster_port_slave;
 our $opt_ndbconnectstring_slave;
 
-our $opt_old_master;
-
 our $opt_record;
 our $opt_check_testcases;
 
@@ -654,7 +652,6 @@ sub command_line_setup () {
              'debug'                    => \$opt_debug,
              'fast'                     => \$opt_fast,
              'netware'                  => \$opt_netware,
-             'old-master'               => \$opt_old_master,
              'reorder'                  => \$opt_reorder,
              'script-debug'             => \$opt_script_debug,
              'verbose'                  => \$opt_verbose,
@@ -2741,17 +2738,6 @@ sub mysqld_arguments ($$$$$) {
     mtr_add_arg($args, "%s--user=root", $prefix);
   }
 
-  if ( $type eq 'master' )
-  {
-
-    if ( ! $opt_old_master )
-    {
-      mtr_add_arg($args, "%s--rpl-recovery-rank=1", $prefix);
-      mtr_add_arg($args, "%s--init-rpl-role=master", $prefix);
-    }
-
-  }
-
   foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )
   {
     mtr_add_arg($args, "%s%s", $prefix, $arg);