diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-14 11:33:10 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-14 11:33:10 +0200 |
| commit | ff435f882e137c43cb82b2cf810423b7d08bad69 (patch) | |
| tree | df9dd5e373d5c5da4c8e67a34d0b4fb388019a5a /mysql-test/lib/v1 | |
| parent | 48582afb84fc8c36d6fb0df0777db58ccf5b9419 (diff) | |
| parent | ec1d665c645b3fb4d7b7d1c31cc7e89d684dc0f4 (diff) | |
| download | mariadb-git-ff435f882e137c43cb82b2cf810423b7d08bad69.tar.gz | |
Upmerge and port 46882
Diffstat (limited to 'mysql-test/lib/v1')
| -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" ) |