Commit 50941b92 authored by unknown's avatar unknown
Browse files

Remove opt_old_master, using a 4.0 mysqld with mysql-test-run.pl from 5.1 is not supported

parent edec3302

mysql-test/mysql-test-run.pl

+0 −14
Original line number Diff line number Diff line
@@ -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);