bzr commit into mysql-5.5-mtr branch (bjorn.munch:3135) Bug#59182

[Bjorn Munch]

#At file:///home/bm136801/my/header-55/ based on revid:bjorn.munch@stripped

 3135 Bjorn Munch	2010-12-30
      Bug #59182 output of mysql-test-run.pl - mismatch between col names and actual col contents
      Added optional WORKERID in header, and COMMENT
      Extended print_line to 74 chars, which is max length of header

    modified:
      mysql-test/lib/mtr_report.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2010-09-20 08:12:39 +0000
+++ b/mysql-test/lib/mtr_report.pm	2010-12-30 12:34:07 +0000
@@ -395,7 +395,7 @@ sub mtr_report_stats ($$;$) {
 ##############################################################################
 
 sub mtr_print_line () {
-  print '-' x 60 . "\n";
+  print '-' x 74 . "\n";
 }
 
 
@@ -408,10 +408,14 @@ sub mtr_print_thick_line {
 sub mtr_print_header () {
   print "\n";
   printf "TEST";
-  print " " x 38;
+  if ($::opt_parallel > 1) {
+    print " " x 32 . "WORKERID ";
+  } 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";
 }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-12-29 15:28:19 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-12-30 12:34:07 +0000
@@ -308,7 +308,7 @@ my $opt_max_save_core= env_or_val(MTR_MA
 my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20);
 my $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 10);
 
-my $opt_parallel= $ENV{MTR_PARALLEL} || 1;
+our $opt_parallel= $ENV{MTR_PARALLEL} || 1;
 
 select(STDOUT);
 $| = 1; # Automatically flush STDOUT


Attachment: [text/bzr-bundle] bzr/[e-mail]