From 8f813df45caccbf58aec4f9b80672aa1adf93141 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 28 Nov 2006 11:43:56 +0100
Subject: [PATCH] Fix problem with mysqladmin logging to var/log before var has
 been created And if var/ has been created, it will be recreated later so the
 logs will be lost

mysql-test/lib/mtr_process.pl:
  Send output - if any - from mysqladmin to stdout/stderr. There shouldn't
  be any such errors and if any occur, it's good to know about them.
mysql-test/mysql-test-run.pl:
  Don't create vardir before mtr_kill_leftovers
---
 mysql-test/lib/mtr_process.pl |  5 ++---
 mysql-test/mysql-test-run.pl  | 13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 9d0c1f601ba..37a82177f46 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -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;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ab347157168..840a3865625 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1915,19 +1915,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();
    }
 }