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

[Bjorn Munch]

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

 3141 Bjorn Munch	2011-01-12
      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

    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	2011-01-11 14:15:25 +0000
+++ b/mysql-test/lib/mtr_report.pm	2011-01-12 09:27:46 +0000
@@ -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";
 }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-01-11 13:27:03 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-01-12 09:27:46 +0000
@@ -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');
 


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