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
45c5eca0
Commit
45c5eca0
authored
Jun 14, 2010
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #46882 Suite timeout doesn't kill stray processes
Kill mysqltest and call mtr_kill_leftovers() before terminating
parent
b564aa92
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+2
-1
No files found.
mysql-test/lib/mtr_process.pl
View file @
45c5eca0
...
@@ -264,8 +264,9 @@ sub spawn_parent_impl {
...
@@ -264,8 +264,9 @@ sub spawn_parent_impl {
if
(
$timer_name
eq
"
suite
"
)
if
(
$timer_name
eq
"
suite
"
)
{
{
# We give up here
# We give up here
# FIXME we should only give up the suite, not all of the run?
print
STDERR
"
\n
";
print
STDERR
"
\n
";
kill
(
9
,
$pid
);
# Kill mysqltest
mtr_kill_leftovers
();
# Kill servers the hard way
mtr_error
("
Test suite timeout
");
mtr_error
("
Test suite timeout
");
}
}
elsif
(
$timer_name
eq
"
testcase
"
)
elsif
(
$timer_name
eq
"
testcase
"
)
...
...
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