Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

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