Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
mariadb
Commits
b18902fd
Commit
b18902fd
authored
14 years ago
by
Bjorn Munch
Browse files
Options
Download
Email Patches
Plain Diff
Bug #46882 Suite timeout doesn't kill stray processes
Kill mysqltest and call mtr_kill_leftovers() before terminating
parent
41297909
Changes
1
Hide 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 @
b18902fd
...
...
@@ -264,8 +264,9 @@ sub spawn_parent_impl {
if
(
$timer_name
eq
"
suite
"
)
{
# We give up here
# FIXME we should only give up the suite, not all of the run?
print
STDERR
"
\n
";
kill
(
9
,
$pid
);
# Kill mysqltest
mtr_kill_leftovers
();
# Kill servers the hard way
mtr_error
("
Test suite timeout
");
}
elsif
(
$timer_name
eq
"
testcase
"
)
...
...
This diff is collapsed.
Click to expand it.
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