database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
msvensson@shellback.(none)
2006-09-19 17:47:53 +02:00
parent 1b3094187a 0e7d18d8e4
commit ee5ca6e231
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/lib/mtr_process.pl
View File

@ -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.");

3
mysql-test/mysql-test-run.pl
View File

@ -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($$$) {
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;