Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3a11b2be
Commit
3a11b2be
authored
Feb 28, 2007
by
msvensson@pilot.blaudden
Browse files
Options
Browse Files
Download
Plain Diff
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
parents
0df3d939
44959af2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+2
-8
No files found.
mysql-test/lib/mtr_process.pl
View file @
3a11b2be
...
@@ -22,7 +22,7 @@ use Socket;
...
@@ -22,7 +22,7 @@ use Socket;
use
Errno
;
use
Errno
;
use
strict
;
use
strict
;
use
POSIX
'
WNOHANG
'
;
use
POSIX
qw(WNOHANG SIGHUP)
;
sub
mtr_run
($$$$$$
;
$
);
sub
mtr_run
($$$$$$
;
$
);
sub
mtr_spawn
($$$$$$
;
$
);
sub
mtr_spawn
($$$$$$
;
$
);
...
@@ -1120,12 +1120,6 @@ sub mtr_kill_processes ($) {
...
@@ -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
($)
{
sub
mtr_exit
($)
{
my
$code
=
shift
;
my
$code
=
shift
;
mtr_timer_stop_all
(
$::glob_timers
);
mtr_timer_stop_all
(
$::glob_timers
);
...
@@ -1137,7 +1131,7 @@ sub mtr_exit ($) {
...
@@ -1137,7 +1131,7 @@ sub mtr_exit ($) {
# set ourselves as the group leader at startup (with
# set ourselves as the group leader at startup (with
# POSIX::setpgrp(0,0)), but then care must be needed to always do
# POSIX::setpgrp(0,0)), but then care must be needed to always do
# proper child process cleanup.
# proper child process cleanup.
kill
('
HUP
'
,
-
$$
)
if
!
$::glob_win32_perl
and
$$
==
getpgrp
();
POSIX::
kill
(
SIGHUP
,
-
$$
)
if
!
$::glob_win32_perl
and
$$
==
getpgrp
();
exit
(
$code
);
exit
(
$code
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment