diff options
author | unknown <msvensson@neptunus.(none)> | 2006-11-28 12:36:26 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-11-28 12:36:26 +0100 |
commit | 58c571a493bb64198f6734e256c376a36788d7f9 (patch) | |
tree | da61688f0d5216f76d4ec6919ba03cd227cd0e67 /mysql-test/mysql-test-run.pl | |
parent | f4fc2207273bc16467c45e80488e5073718216dd (diff) | |
download | mariadb-git-58c571a493bb64198f6734e256c376a36788d7f9.tar.gz |
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
from "mtr_kill_leftovers" will be lost anyway
mysql-test/mysql-test-run.pl:
Don't create vardir before mtr_kill_leftovers
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.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 694ff4b712e..d06a6a0a6a0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1887,19 +1887,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(); } } |