diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
commit | 66d9696596edbc20ad36bf3d5bffb5595e8235c3 (patch) | |
tree | bbef37c9a90b63d25bee59386cac04298a13846f /mysql-test/lib/mtr_report.pm | |
parent | 66a58f46e937cdc3d7e0529b52ad8b658d9b2cd4 (diff) | |
parent | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff) | |
download | mariadb-git-66d9696596edbc20ad36bf3d5bffb5595e8235c3.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/lib/mtr_report.pm')
-rw-r--r-- | mysql-test/lib/mtr_report.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 9ab82c454ed..97ace54f0fb 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -34,7 +34,6 @@ use mtr_match; use My::Platform; use POSIX qw[ _exit ]; use IO::Handle qw[ flush ]; -require "mtr_io.pl"; use mtr_results; my $tot_real_time= 0; @@ -92,7 +91,7 @@ sub mtr_report_test_passed ($) { my $timer_str= ""; if ( $timer and -f "$::opt_vardir/log/timer" ) { - $timer_str= mtr_fromfile("$::opt_vardir/log/timer"); + $timer_str= ::mtr_fromfile("$::opt_vardir/log/timer"); $tinfo->{timer}= $timer_str; resfile_test_info('duration', $timer_str) if $::opt_resfile; } |