bk commit into 5.1 tree (msvensson:1.2204)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2204 06/06/14 21:46:41 msvensson@neptunus.(none) +1 -0
  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
    1.135 06/06/14 21:46:36 msvensson@neptunus.(none) +0 -14
    Remove opt_old_master, using a 4.0 mysqld with mysql-test-run.pl from 5.1 is not supported

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.134/mysql-test/mysql-test-run.pl	2006-06-14 21:45:10 +02:00
+++ 1.135/mysql-test/mysql-test-run.pl	2006-06-14 21:46:36 +02:00
@@ -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,
@@ -2739,17 +2736,6 @@ sub mysqld_arguments ($$$$$) {
   {
     # We are running as root;  We need to add the --root argument
     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 )