diff options
| author | unknown <kent@mysql.com> | 2005-09-01 14:34:33 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-09-01 14:34:33 +0200 |
| commit | 01a693dd29aa6c72393291bdddb25481a01957fa (patch) | |
| tree | b1a27b904e59c19c774489081e6126b5ab632029 /mysql-test/lib | |
| parent | bf4ffddd34e0e50c55382264d9973a5862437c8d (diff) | |
| parent | b63869bd1e41ee95ac0b5f6b53a4c23a3197e845 (diff) | |
| download | mariadb-git-01a693dd29aa6c72393291bdddb25481a01957fa.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
mysql-test/lib/mtr_process.pl:
Auto merged
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 1b6dcf0e7fc..d3b652186dd 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 |