diff options
author | Sergei Golubchik <serg@mariadb.org> | 2021-01-24 21:57:37 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-22 19:27:12 +0100 |
commit | 3b0b4e614c22362baf05e7a5fba0bc2d739b7d84 (patch) | |
tree | 144cb6d5b81335ff3d9e0e6adc412fdb9d1a9628 | |
parent | c4f0133444d2a867ee79f5c16b9d7829a05861cd (diff) | |
download | mariadb-git-3b0b4e614c22362baf05e7a5fba0bc2d739b7d84.tar.gz |
cleanup: remove dead code in mtr
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 05ceab98d7e..1c51acf7341 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -48,9 +48,7 @@ BEGIN { "Could not find the lib/ directory \n"; exit(1); } -} -BEGIN { # Check backward compatibility support # By setting the environment variable MTR_VERSION # it's possible to use a previous version of @@ -338,17 +336,7 @@ my %mysqld_logs; my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions. my $warn_seconds = 60; -sub testcase_timeout ($) { - my ($tinfo)= @_; - if (exists $tinfo->{'case-timeout'}) { - # Return test specific timeout if *longer* that the general timeout - my $test_to= $tinfo->{'case-timeout'}; - $test_to*= 10 if $opt_valgrind; - return $test_to * 60 if $test_to > $opt_testcase_timeout; - } - return $opt_testcase_timeout * 60; -} - +sub testcase_timeout ($) { return $opt_testcase_timeout * 60; } sub check_timeout ($) { return testcase_timeout($_[0]); } our $opt_warnings= 1; |