From: Bjorn Munch
Date: January 12 2011 9:28am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3141) Bug#59182
List-Archive: http://lists.mysql.com/commits/128487
X-Bug: 59182
Message-Id: <201101120928.p0C9SBCU012950@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1288477651=="

--===============1288477651==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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');
 


--===============1288477651==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/genplug-55/
# testament_sha1: 9b8b9029e1bd9d2179a8bf8b980c9160f69f8d38
# timestamp: 2011-01-12 10:28:11 +0100
# source_branch: file:///home/bm136801/my/lineno-51/
# base_revision_id: bjorn.munch@stripped\
#   2f3tgt6m1pdj24br
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTlrPg0AAnBfgEAQXOf//1or
lIS////6UAVmeANDNqRUAAJJCFJ/qap41PEyNT0U8JqepjJAPFA9QbUOYTAJgBMJhNMAAAmTTQMN
NQ0SntJNGh6J6Rp6gBo9QyGJmiaN6oOYTAJgBMJhNMAAAmTTQMJIhJgATITEYk8pkymBqnoNRk0P
UwoeVUXLKdWOcPzzHZeo2B02V7hk6Sru+0aEk6UukvnljnmkaEjqRPEdDpYb3mg5YuUJvR+Lxl7z
AcSoZMwE7LUFdxZ6yxx3i8mTi0YCSKb7BNAvmhr5uCy7bixwepvdusU/dUW1ss2NHOojRiuXqm9E
BKadMbkzECe6WD1o4jOHf57oM9frx26oGdNBwRoPJggIb5szMbnNjB6a72+fTwmz92sLULouNZsx
7sy4Ys9QIrnWc4l5ufcJVAE4w0h54l5vklzzdKl37RDVU6FISgYB4fXVQDyHpKCdO1AHnAIBkbCk
rjQwrEGoZrIIVkU/LWaVeUkUoUHQ6NSYByUz0sAwU0zmqzC1pz+g+6mP7rrIBZQrOMmgfG3pa9pa
eYGmF57rjOAbhHcqtleI7M/KFKAgCdQ/ta9BiW9ygCG6tyGboqU3wNvTVaz194S9qyCw51Yjwzv3
mRdJ1vdXxNxT8XXlrKMdB5+pVEIDmYNm0UzqauwitfEqAj1LCbArBNUvUqyL9o/qWHrwtgjGSl4p
diNN+fsLOOBkcjQ/Mx429xt/IFpDoTj1UgTjwvLDqBL3+WJIyp8cd1elgVzRJqBupy+ByUqqO8uK
DvjAqL+nfEDfOtk2WQWRs8LDM54F88pDNYUXYVzWUaRGGCyieq9tSkN7oE1MyDzwlC4yyxfCtVEI
YDDkBqPCkhS+VrwCMe7kVi77EawAvLkggfA4f45MDm06EMau8M6hhaCAYahCw2BEWcEEg6OwTbVO
1+636XdRGH7Jq0SIjKkVsY0mVqONTwYUNZbpLtkDx4SXR8ozfLCJZZyRYoI+9n2+sVkrHpwrEc0z
Q8QPlTTeZnp9CrXrJQ2V16I7HcmHekw7yXACgcR7xEv0zHbvPMYcSczHcT1F94yS7u6h2Eth7CWb
w56pnZVmXOnUSxJwmBrDiRJI1xjGmdfbmtbK72KuVh7GFTgFu4rI7fxrPxAr4nUqtyXMOeRRbbuV
uTHmkxNRylIWRnWPDWzf1xmbHRFe5VODcyatjJCe7Le/nRc+YGYpnRJwtAplRN2GjZeDLbYc1vrc
41Ew1ilivA1GI0VuNtJnc26VvaKHbNSZFrD4DJLwF+5P2l4z+OIFJn0OfNsvB6z0uQ2FOJyVxwFA
IQ2IxzzgdL8kliNJYjWPK5089h4HnqEtGuzW3TLejwvYn8HfYYRRzJBkiLhgViTFzEU/lXVLR1dK
ioKK8hmVqEx3p8C9qiVj7XOGz8FE0y4THI+fyEt3kBIjIL9Lb8z8l0BKQOS7DqlRvYSaSOJJyrE1
FUAIifcOOTMnZDLr1955EJcL6s/d0QFR6sqoaj/ZP9hK1Hpaskl0CK2mU8xtOXQW2XVm6OMDSXJU
aHMVbdyuso/oYKyuk4YX5AfC0BiqIuB2JqLjmwdxrlCtEyQTLynGPo2uKWKx89aqi0wFKQVRhrIq
TbiY+RBc4SH3vDN/G0KKydDGoOEPI9mZs+oqhY1IcyiQ4ozx4NAxW9OdlM4R2noE8JEJZaaDK8G9
Vqssp7XE8EVKzch4DamDZ7+unbIyoW/9NelE9gfxcJehT857tLD1yV+KOzbrh+oDAS29w0wGG/hF
X0GlMjUA6Lx61Mc/pEXYrIWROK1UFOlyP/i7kinChIHLWfBo


--===============1288477651==--