diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-14 11:31:22 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-14 11:31:22 +0200 |
| commit | 51a965f3713f887459578cff0641aeadd15ec38c (patch) | |
| tree | d84fa37cab5ef24c6243e99353d7b9892463c566 | |
| parent | 13a43a1aac3e098dd3a261dc944ff25c3f8d2437 (diff) | |
| parent | 45c5eca0aa0979db244b6a558e7d15021775a4e7 (diff) | |
| download | mariadb-git-51a965f3713f887459578cff0641aeadd15ec38c.tar.gz | |
Upmerge and port 46882
| -rw-r--r-- | mysql-test/lib/v1/mtr_process.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/lib/v1/mtr_process.pl b/mysql-test/lib/v1/mtr_process.pl index 8fd900330da..4a4e342bff6 100644 --- a/mysql-test/lib/v1/mtr_process.pl +++ b/mysql-test/lib/v1/mtr_process.pl @@ -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" ) |