Commit ae2603c1 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/work/my51-work 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 7fef817a 8ed01c83

mysql-test/lib/mtr_process.pl

+0 −8
Original line number Diff line number Diff line
@@ -476,14 +476,6 @@ sub mtr_kill_leftovers () { 


        mtr_debug("Got pid: $pid from file '$pidfile'");



        # Race, could have been removed between I tested with -f

        # and the unlink() below, so I better check again with -f



        if ( ! unlink($pidfile) and -f $pidfile )

        {

          mtr_error("can't remove $pidfile");

        }



        if ( $::glob_cygwin_perl or kill(0, $pid) )

        {

          mtr_debug("There is process with pid $pid -- scheduling for kill.");

mysql-test/mysql-test-run.pl

+1 −2
Original line number Diff line number Diff line
@@ -1666,7 +1666,7 @@ sub kill_running_server () { 
  {

    # Ensure that no old mysqld test servers are running

    # This is different from terminating processes we have

    # started from ths run of the script, this is terminating

    # started from this run of the script, this is terminating

    # leftovers from previous runs.



    mtr_report("Killing Possible Leftover Processes");
@@ -3421,7 +3421,6 @@ sub run_testcase_stop_servers($$$) { 
  my %admin_pids; # hash of admin processes that requests shutdown

  my @kill_pids;  # list of processes to shutdown/kill





  # Remember if we restarted for this test case

  $tinfo->{'restarted'}= $do_restart;