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

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

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2006-09-19 17:40:49 +02:00
parent 21440cb4cb ea1a9e41a6
commit 3b32e5dbb0
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,14 +470,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.");

1
mysql-test/lib/mtr_stress.pl
View File

@ -21,7 +21,6 @@ sub run_stress_test ()
{ {
my $args; my $args;
my $stress_basedir;
my $stress_suitedir; my $stress_suitedir;
mtr_report("Starting stress testing\n"); mtr_report("Starting stress testing\n");

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

@ -1309,7 +1309,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");
@ -2748,7 +2748,7 @@ sub stop_masters () {
my @args; my @args;
for ( my $idx; $idx < 2; $idx++ ) for ( my $idx= 0; $idx < 2; $idx++ )
{ {
# FIXME if we hit ^C before fully started, this test will prevent # FIXME if we hit ^C before fully started, this test will prevent
# the mysqld process from being killed # the mysqld process from being killed
@ -2779,7 +2779,7 @@ sub stop_slaves () {
my @args; my @args;
for ( my $idx; $idx < 3; $idx++ ) for ( my $idx= 0; $idx < 3; $idx++ )
{ {
if ( $slave->[$idx]->{'pid'} ) if ( $slave->[$idx]->{'pid'} )
{ {