Skip to content

Commit 3b0b4e6

Browse files
committed
cleanup: remove dead code in mtr
1 parent c4f0133 commit 3b0b4e6

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

mysql-test/mysql-test-run.pl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ BEGIN
4848
"Could not find the lib/ directory \n";
4949
exit(1);
5050
}
51-
}
5251

53-
BEGIN {
5452
# Check backward compatibility support
5553
# By setting the environment variable MTR_VERSION
5654
# it's possible to use a previous version of
@@ -338,17 +336,7 @@ END
338336
my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions.
339337
my $warn_seconds = 60;
340338

341-
sub testcase_timeout ($) {
342-
my ($tinfo)= @_;
343-
if (exists $tinfo->{'case-timeout'}) {
344-
# Return test specific timeout if *longer* that the general timeout
345-
my $test_to= $tinfo->{'case-timeout'};
346-
$test_to*= 10 if $opt_valgrind;
347-
return $test_to * 60 if $test_to > $opt_testcase_timeout;
348-
}
349-
return $opt_testcase_timeout * 60;
350-
}
351-
339+
sub testcase_timeout ($) { return $opt_testcase_timeout * 60; }
352340
sub check_timeout ($) { return testcase_timeout($_[0]); }
353341

354342
our $opt_warnings= 1;

0 commit comments

Comments
 (0)