bk commit into 5.1 tree (msvensson:1.2201)

[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.2201 06/03/19 20:24:31 msvensson@shellback.(none) +1 -0
  Remove unused variables and options for old "manager" which is no longer used

  mysql-test/mysql-test-run.pl
    1.90 06/03/19 20:24:25 msvensson@shellback.(none) +5 -12
    Remove unused variables and options for old "manager" which is no longer used

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/mysqltestrun_pl/my51-mysqltestrun_pl

--- 1.89/mysql-test/mysql-test-run.pl	2006-03-19 20:03:28 +01:00
+++ 1.90/mysql-test/mysql-test-run.pl	2006-03-19 20:24:25 +01:00
@@ -158,7 +158,6 @@
 our $path_language;
 our $path_timefile;
 our $path_snapshot;
-our $path_manager_log;           # Used by mysqldadmin
 our $path_slave_load_tmpdir;     # What is this?!
 our $path_mysqltest_log;
 our $path_my_basedir;
@@ -246,9 +245,6 @@
 our $opt_ndbcluster_port_slave;
 our $opt_ndbconnectstring_slave;
 
-our $opt_no_manager;            # Does nothing now, we never use manager
-our $opt_manager_port;          # Does nothing now, we never use manager
-
 our $opt_old_master;
 
 our $opt_record;
@@ -565,7 +561,6 @@
              'compress'                 => \$opt_compress,
              'bench'                    => \$opt_bench,
              'small-bench'              => \$opt_small_bench,
-             'no-manager'               => \$opt_no_manager, # Currently not used
 
              # Control what test suites or cases to run
              'force'                    => \$opt_force,
@@ -588,7 +583,6 @@
              'slave_port=i'             => \$opt_slave_myport,
              'ndbcluster_port=i'        => \$opt_ndbcluster_port,
              'ndbcluster_port_slave=i'  => \$opt_ndbcluster_port_slave,
-             'manager-port=i'           => \$opt_manager_port, # Currently not used
              'im-port=i'                => \$im_port, # Instance Manager port.
              'im-mysqld1-port=i'        => \$im_mysqld1_port, # Port of mysqld,
controlled by IM
              'im-mysqld2-port=i'        => \$im_mysqld2_port, # Port of mysqld,
controlled by IM
@@ -725,9 +719,7 @@
 
   $opt_tmpdir=       "$opt_vardir/tmp" unless $opt_tmpdir;
   $opt_tmpdir =~ s,/+$,,;       # Remove ending slash if any
-  # FIXME maybe not needed?
-  $path_manager_log= "$opt_vardir/log/manager.log"
-    unless $path_manager_log;
+
   $opt_current_test= "$opt_vardir/log/current_test"
     unless $opt_current_test;
 
@@ -1274,7 +1266,7 @@
     # leftovers from previous runs.
 
     mtr_report("Killing Possible Leftover Processes");
-    mkpath("$opt_vardir/log"); # Needed for mysqladmin log
+    mkpath("$opt_vardir/log");
     mtr_kill_leftovers();
 
     $using_ndbcluster_master= $opt_with_ndbcluster;
@@ -1874,8 +1866,9 @@
     mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);
   }
 
+  my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";
   if ( mtr_run($exe_mysqld, $args, $init_db_sql_tmp,
-               $path_manager_log, $path_manager_log, "") != 0 )
+               $path_bootstrap_log, $path_bootstrap_log, "") != 0 )
   {
     unlink($init_db_sql_tmp);
     mtr_error("Error executing mysqld --bootstrap\n" .
@@ -2097,7 +2090,7 @@
 
 # FIXME test cases that depend on each other, prevent this from
 # being at this location.
-#  do_before_start_master($tname,$tinfo->{'master_sh'});
+#  do_before_start_mster($tname,$tinfo->{'master_sh'});
 
   # ----------------------------------------------------------------------
   # If any mysqld servers running died, we have to know