From a131dae21c81b4450815d2c111bdb56565c66b9f Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 1 Sep 2006 18:21:19 +0400 Subject: [PATCH] Fix typo, which prevents test suite from correct cleanup. --- mysql-test/lib/mtr_process.pl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 9a558f91822..ed744e13d95 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -31,7 +31,7 @@ sub mtr_im_check_alive ($); sub mtr_im_check_main_alive ($); sub mtr_im_check_angel_alive ($); sub mtr_im_check_mysqlds_alive ($); -sub mtr_im_check_mysqld_alive ($$); +sub mtr_im_check_mysqld_alive ($); sub mtr_im_cleanup ($); sub mtr_im_rm_file ($); sub mtr_im_errlog ($); @@ -1279,21 +1279,20 @@ sub mtr_im_check_mysqlds_alive($) { mtr_debug("Checking mysqld[$idx]..."); return 1 - if mtr_im_check_mysqld_alive($instance_manager, $instances->[$idx]); + if mtr_im_check_mysqld_alive($instances->[$idx]); } } ########################################################################### -sub mtr_im_check_mysqld_alive($$) { - my $instance_manager= shift; +sub mtr_im_check_mysqld_alive($) { my $mysqld_instance= shift; # Check that the process is dead. - if (defined $instance_manager->{'pid'}) + if (defined $mysqld_instance->{'pid'}) { - if (kill (0, $instance_manager->{'pid'})) + if (kill (0, $mysqld_instance->{'pid'})) { mtr_debug("Mysqld instance (PID: $mysqld_instance->{pid}) is alive."); return 1;