Commit 6b890467 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
parents 3124fd37 37b0e2b6

mysql-test/lib/mtr_process.pl

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

use strict;



use POSIX 'WNOHANG';

use POSIX qw(WNOHANG SIGHUP);



sub mtr_run ($$$$$$;$);

sub mtr_spawn ($$$$$$;$);
@@ -1120,12 +1120,6 @@ sub mtr_kill_processes ($) { 
#

##############################################################################



# FIXME something is wrong, we sometimes terminate with "Hangup" written

# to tty, and no STDERR output telling us why.



# FIXME for some reason, setting HUP to 'IGNORE' will cause exit() to

# write out "Hangup", and maybe loose some output. We insert a sleep...



sub mtr_exit ($) {

  my $code= shift;

  mtr_timer_stop_all($::glob_timers);
@@ -1137,7 +1131,7 @@ sub mtr_exit ($) { 
  # set ourselves as the group leader at startup (with

  # POSIX::setpgrp(0,0)), but then care must be needed to always do

  # proper child process cleanup.

  kill('HUP', -$$) if !$::glob_win32_perl and $$ == getpgrp();

  POSIX::kill(SIGHUP, -$$) if !$::glob_win32_perl and $$ == getpgrp();



  exit($code);

}