Commit 90b23da3 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents b0c262c0 3c0a7466

mysql-test/lib/mtr_process.pl

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ use Socket; 
use Errno;

use strict;



#use POSIX ":sys_wait_h";

use POSIX 'WNOHANG';



sub mtr_run ($$$$$$;$);
@@ -1088,7 +1087,6 @@ sub mtr_kill_processes ($) { 


sub mtr_exit ($) {

  my $code= shift;

#  cluck("Called mtr_exit()");

  mtr_timer_stop_all($::glob_timers);

  local $SIG{HUP} = 'IGNORE';

  # ToDo: Signalling -$$ will only work if we are the process group

mysql-test/lib/mtr_timer.pl

+2 −7
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ use Socket; 
use Errno;

use strict;



#use POSIX ":sys_wait_h";

#use POSIX 'WNOHANG';



sub mtr_init_timers ();

sub mtr_timer_start($$$);

sub mtr_timer_stop($$);
@@ -142,10 +139,8 @@ sub mtr_timer_timeout ($$) { 


  return "" unless exists $timers->{'pids'}->{$pid};



  # We got a timeout

  my $name= $timers->{'pids'}->{$pid};

  mtr_timer_stop($timers, $name);

  return $name;

  # We got a timeout, return the name ot the timer

  return $timers->{'pids'}->{$pid};

}



1;

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -2913,6 +2913,7 @@ sub run_testcase ($) { 
  # ----------------------------------------------------------------------

  if ( $opt_start_and_exit or $opt_start_dirty )

  {

    mtr_timer_stop_all($glob_timers);

    mtr_report("\nServers started, exiting");

    exit(0);

  }