diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index ab2af8c4ccf..9f8eb8e92bd 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -476,14 +476,6 @@ sub mtr_kill_leftovers () { mtr_debug("Got pid: $pid from file '$pidfile'"); - # Race, could have been removed between I tested with -f - # and the unlink() below, so I better check again with -f - - if ( ! unlink($pidfile) and -f $pidfile ) - { - mtr_error("can't remove $pidfile"); - } - if ( $::glob_cygwin_perl or kill(0, $pid) ) { mtr_debug("There is process with pid $pid -- scheduling for kill."); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index fc39ba9c6e1..dcfd4e85182 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1666,7 +1666,7 @@ sub kill_running_server () { { # Ensure that no old mysqld test servers are running # This is different from terminating processes we have - # started from ths run of the script, this is terminating + # started from this run of the script, this is terminating # leftovers from previous runs. mtr_report("Killing Possible Leftover Processes"); @@ -3421,7 +3421,6 @@ sub run_testcase_stop_servers($$$) { my %admin_pids; # hash of admin processes that requests shutdown my @kill_pids; # list of processes to shutdown/kill - # Remember if we restarted for this test case $tinfo->{'restarted'}= $do_restart;