diff options
author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-01-12 10:27:46 +0100 |
---|---|---|
committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-01-12 10:27:46 +0100 |
commit | 7b64f3a8ec0c07b9a40c095564c68a7ca06616ce (patch) | |
tree | 81bb8368a34c6831a247eb3ee2cba3efdd6a0871 | |
parent | aa5110c0f1766693ef53fa7b5b625fe98eb27479 (diff) | |
download | mariadb-git-7b64f3a8ec0c07b9a40c095564c68a7ca06616ce.tar.gz |
Bug #59182 output of mysql-test-run.pl - mismatch between col names and actual col contents
New patch, avoid global $opt_parallel
I still prefer not to print workerid when not doing parallel
-rw-r--r-- | mysql-test/lib/mtr_report.pm | 15 | ||||
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 3be679858bc..cd3f9ce1041 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -396,7 +396,7 @@ sub mtr_report_stats ($$;$) { ############################################################################## sub mtr_print_line () { - print '-' x 60 . "\n"; + print '-' x 74 . "\n"; } @@ -406,13 +406,18 @@ sub mtr_print_thick_line { } -sub mtr_print_header () { +sub mtr_print_header ($) { + my ($wid) = @_; print "\n"; printf "TEST"; - print " " x 38; + if ($wid) { + print " " x 34 . "WORKER "; + } else { + print " " x 38; + } print "RESULT "; - print "TIME (ms)" if $timer; - print "\n"; + print "TIME (ms) or " if $timer; + print "COMMENT\n"; mtr_print_line(); print "\n"; } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e2bb5d24205..83f6a83682d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -438,7 +438,7 @@ sub main { mtr_report(); mtr_print_thick_line(); - mtr_print_header(); + mtr_print_header($opt_parallel > 1); mark_time_used('init'); |