Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-5.0
This commit is contained in:
kent@mysql.com 2005-09-01 14:34:33 +02:00
commit 9de5938254

View file

@ -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