Commit 01a693dd authored by unknown's avatar unknown
Browse files

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
parents bf4ffddd b63869bd

mysql-test/lib/mtr_process.pl

+3 −3
Original line number Diff line number Diff line
@@ -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