bk commit into 5.0 tree (msvensson:1.2126)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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.2126 06/05/10 15:01:15 msvensson@neptunus.(none) +1 -0
  Remove the unused options "local" and "local-master"  

  mysql-test/mysql-test-run.pl
    1.95 06/05/10 15:01:10 msvensson@neptunus.(none) +3 -27
    Remove the unused options "local" and "local-master"  

# 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/my50-bug18628

--- 1.94/mysql-test/mysql-test-run.pl	2006-05-09 08:26:19 +02:00
+++ 1.95/mysql-test/mysql-test-run.pl	2006-05-10 15:01:10 +02:00
@@ -235,9 +235,6 @@
 our $opt_gprof_master;
 our $opt_gprof_slave;
 
-our $opt_local;
-our $opt_local_master;
-
 our $master;                    # Will be struct in C
 our $slave;
 
@@ -574,7 +571,7 @@
              'record'                   => \$opt_record,
              'check-testcases'          => \$opt_check_testcases,
 
-             # ???
+             # Extra parameters to use when starting mysqld
              'mysqld=s'                 => \@opt_extra_mysqld_opt,
 
              # Run test on running server
@@ -624,8 +621,6 @@
              'comment=s'                => \$opt_comment,
              'debug'                    => \$opt_debug,
              'fast'                     => \$opt_fast,
-             'local'                    => \$opt_local,
-             'local-master'             => \$opt_local_master,
              'netware'                  => \$opt_netware,
              'old-master'               => \$opt_old_master,
              'reorder'                  => \$opt_reorder,
@@ -712,11 +707,6 @@
   # Do sanity checks of command line arguments
   # --------------------------------------------------------------------------
 
-  if ( $opt_extern and $opt_local )
-  {
-    mtr_error("Can't use --extern and --local at the same time");
-  }
-
   if ( ! $opt_socket )
   {     # FIXME set default before reading options?
 #    $opt_socket=  '@MYSQL_UNIX_ADDR@';
@@ -750,12 +740,6 @@
     push(@glob_test_mode, "ps-protocol");
   }
 
-  # FIXME don't understand what this is
-#  if ( $opt_local_master )
-#  {
-#    $opt_master_myport=  3306;
-#  }
-
   if ( $opt_small_bench )
   {
     $opt_bench=  1;
@@ -1530,7 +1514,7 @@
 
   my $args;
 
-  if ( ! $glob_use_embedded_server and ! $opt_local_master )
+  if ( ! $glob_use_embedded_server )
   {
     $master->[0]->{'pid'}= mysqld_start('master',0,[],[],
 				       $using_ndbcluster_master);
@@ -1995,11 +1979,10 @@
   if ( ! $glob_use_running_server and ! $glob_use_embedded_server )
   {
     # FIXME give the args to the embedded server?!
-    # FIXME what does $opt_local_master mean?!
     # FIXME split up start and check that started so that can do
     #       starts in parallel, masters and slaves at the same time.
 
-    if ( $tinfo->{'component_id'} eq 'mysqld' and ! $opt_local_master )
+    if ( $tinfo->{'component_id'} eq 'mysqld' )
     {
       if ( $opt_with_ndbcluster and $master->[0]->{'ndbcluster'} )
       {
@@ -2539,13 +2522,6 @@
       mtr_add_arg($args, "%s--init-rpl-role=master", $prefix);
     }
 
-    # FIXME strange,.....
-    # FIXME MYSQL_MYPORT is not set anythere?!
-    if ( $opt_local_master )
-    {
-      mtr_add_arg($args, "%s--host=127.0.0.1", $prefix);
-      mtr_add_arg($args, "%s--port=%s", $prefix, $ENV{'MYSQL_MYPORT'});
-    }
   }
 
   foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )