summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-09-01 14:32:42 +0200
committerunknown <kent@mysql.com>2005-09-01 14:32:42 +0200
commitb63869bd1e41ee95ac0b5f6b53a4c23a3197e845 (patch)
treef5a9d444295f18baaff20f11de9be5dcbf07160c /mysql-test
parent0caa2a61e06fa0b66c0188fa27df2c047c5e11d9 (diff)
downloadmariadb-git-b63869bd1e41ee95ac0b5f6b53a4c23a3197e845.tar.gz
mtr_process.pl:
Make sure mtr_kill_processes() is called with an array ref Corrected error string for STDERR redirect mysql-test/lib/mtr_process.pl: Make sure mtr_kill_processes() is called with an array ref
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/lib/mtr_process.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index a7587ce691f..bae66353825 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -183,7 +183,7 @@ sub spawn_impl ($$$$$$$$) {
{
if ( ! open(STDERR,$log_file_open_mode,$error) )
{
- mtr_error("can't redirect STDERR to \"$output\": $!");
+ mtr_error("can't redirect STDERR to \"$error\": $!");
}
}
}
@@ -560,8 +560,8 @@ sub mtr_stop_mysqld_servers ($) {
start_reap_all(); # Avoid zombies
- SIGNAL:
- mtr_kill_processes(\keys (%mysqld_pids));
+ my @mysqld_pids= keys %mysqld_pids;
+ mtr_kill_processes(\@mysqld_pids);
stop_reap_all(); # Get into control again