bk commit into 5.1 tree (msvensson:1.2399)

[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@stripped, 2006-11-28 12:41:43+01:00, msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
  into  neptunus.(none):/home/msvensson/mysql/work/my51-work
  MERGE: 1.1810.2320.20

  mysql-test/lib/mtr_process.pl@stripped, 2006-11-28 12:41:27+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.25.2.17

  mysql-test/lib/mtr_report.pl@stripped, 2006-11-28 12:41:28+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.21.1.10

  mysql-test/mysql-test-run.pl@stripped, 2006-11-28 12:41:27+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.30.49.25

# 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/work/my51-work/RESYNC

--- 1.60/mysql-test/lib/mtr_process.pl	2006-11-28 12:42:11 +01:00
+++ 1.61/mysql-test/lib/mtr_process.pl	2006-11-28 12:42:11 +01:00
@@ -708,7 +708,7 @@ sub mtr_wait_blocking($) {
   }
 }
 
-# Start "mysqladmin shutdown" for a specific mysqld
+# Start "mysqladmin <command>" for a specific mysqld
 sub mtr_mysqladmin_start($$$) {
   my $srv= shift;
   my $command= shift;
@@ -738,9 +738,8 @@ sub mtr_mysqladmin_start($$$) {
   # Shutdown time must be high as slave may be in reconnect
   mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo");
   mtr_add_arg($args, "$command");
-  my $path_mysqladmin_log= "$::opt_vardir/log/mysqladmin.log";
   my $pid= mtr_spawn($::exe_mysqladmin, $args,
-		     "", $path_mysqladmin_log, $path_mysqladmin_log, "",
+		     "", "", "", "",
 		     { append_log_file => 1 });
   mtr_verbose("mtr_mysqladmin_start, pid: $pid");
   return $pid;

--- 1.40/mysql-test/lib/mtr_report.pl	2006-11-28 12:42:11 +01:00
+++ 1.41/mysql-test/lib/mtr_report.pl	2006-11-28 12:42:11 +01:00
@@ -94,9 +94,13 @@ sub mtr_report_test_skipped ($) {
   {
     print "[ disabled ]  $tinfo->{'comment'}\n";
   }
-  else
+  elsif ( $tinfo->{'comment'} )
   {
     print "[ skipped ]   $tinfo->{'comment'}\n";
+  }
+  else
+  {
+    print "[ skipped ]\n";
   }
 }
 

--- 1.242/mysql-test/mysql-test-run.pl	2006-11-28 12:42:11 +01:00
+++ 1.243/mysql-test/mysql-test-run.pl	2006-11-28 12:42:11 +01:00
@@ -66,7 +66,6 @@ use IO::Socket::INET;
 use Data::Dumper;
 use strict;
 use warnings;
-use diagnostics;
 
 select(STDOUT);
 $| = 1; # Automatically flush STDOUT
@@ -1976,19 +1975,6 @@ sub kill_running_servers () {
     # This is different from terminating processes we have
     # started from this run of the script, this is terminating
     # leftovers from previous runs.
-
-    if ( ! -d $opt_vardir )
-    {
-      if ( -l $opt_vardir and ! -d readlink($opt_vardir) )
-      {
-	mtr_report("Removing $opt_vardir symlink without destination");
-	unlink($opt_vardir);
-      }
-      # The "var" dir does not exist already
-      # the processes that mtr_kill_leftovers start will write
-      # their log files to var/log so it should be created
-      mkpath("$opt_vardir/log");
-    }
     mtr_kill_leftovers();
    }
 }