Commit 3ac79818 authored by unknown's avatar unknown

Merge shellback.(none):/home/msvensson/mysql/work/my51-work

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 54af7aab d59721d7
...@@ -476,14 +476,6 @@ sub mtr_kill_leftovers () { ...@@ -476,14 +476,6 @@ sub mtr_kill_leftovers () {
mtr_debug("Got pid: $pid from file '$pidfile'"); 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) ) if ( $::glob_cygwin_perl or kill(0, $pid) )
{ {
mtr_debug("There is process with pid $pid -- scheduling for kill."); mtr_debug("There is process with pid $pid -- scheduling for kill.");
......
...@@ -1666,7 +1666,7 @@ sub kill_running_server () { ...@@ -1666,7 +1666,7 @@ sub kill_running_server () {
{ {
# Ensure that no old mysqld test servers are running # Ensure that no old mysqld test servers are running
# This is different from terminating processes we have # 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. # leftovers from previous runs.
mtr_report("Killing Possible Leftover Processes"); mtr_report("Killing Possible Leftover Processes");
...@@ -3421,7 +3421,6 @@ sub run_testcase_stop_servers($$$) { ...@@ -3421,7 +3421,6 @@ sub run_testcase_stop_servers($$$) {
my %admin_pids; # hash of admin processes that requests shutdown my %admin_pids; # hash of admin processes that requests shutdown
my @kill_pids; # list of processes to shutdown/kill my @kill_pids; # list of processes to shutdown/kill
# Remember if we restarted for this test case # Remember if we restarted for this test case
$tinfo->{'restarted'}= $do_restart; $tinfo->{'restarted'}= $do_restart;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment