From: Bjorn Munch
Date: December 30 2010 12:35pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3135) Bug#59182
List-Archive: http://lists.mysql.com/commits/127716
X-Bug: 59182
Message-Id: <201012301235.oBUCZhKY019079@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1961025264=="

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

#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


--===============1961025264==
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/header-55/
# testament_sha1: 5b1537bada27bac5f239419d9bed2c380695dcc7
# timestamp: 2010-12-30 13:35:43 +0100
# base_revision_id: bjorn.munch@stripped\
#   5s6l4lc90xh9ub7x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXkwrnAAAlhfgEAQXOf//34v
1YS////+UAVangALaqU6AGBKIpqeE9FPI9TU9T1I/1SY9J6jU9qJvVDBqMBqaANJIAyaHqPUyaB6
mgNAyMIDQAAGhGhKemJ6o9BinqYgAABkAaaAyHGTJkxGJgBMmCZADRhGAIYBJIIaEwjTKZoTET1G
QyhkaNMgNNGyiC9RYVQ1H6/B3zPBpFTqtZAZQZLTXzxBFocLVkW1FabWuziNA9iWsvaQNl25siXL
q8qLHHeZhUVVVPTxDOrllxGlpisansC/zjY4ybM5Fxrnj70InFkWVXHu5xe0aa3tyTY7kZ+aSAnd
VJv24niYlQijSg5YNpeBfF1Dso+sOF9Q28aTmjMdFgeIbwZbWDrtlk6GFwXIUZz7g0bXbjaMbodw
DHGo+neWmU+4S0AEhhojpQMjCKTMJs2HcUOqchOBQAZzga0hCFYbppOAioDgctTh76DUHSoLmRFQ
dU8hxoQvw4TrWZeimxqiZV6Z6IxqBUAwF1llkJ7HXq++n6B8F9bfKMg1BpuLo+EbuGoHGFpEsKCW
GUA1ncB/wF1VdIzbLO0LGQs9r5pweMC1MI6m2ATg7Xk5LEcbWkeVtBPvOduY7hMCpwB3FgMaX4Rz
07TRCTLmUmdxtvsbTcwDwxKYAy0kFGfLRI0lPmSLCimQmyWordyDsNhNWXa330OA1yRZPo36R274
eR515nO4tlAqMOBeA8KSB1UDnW6pDF2c9ZOqMMA7e0tJTDZnE39DuC/dlQBg11WA83E5r7RsMApq
zJnmg1Byy6qBpiuy0ITWuqNDrLnA1gVEgloKoOhdeUUMU+xuYFxpPQFNcxeNxrQV2ly1sRYoVjmA
G81KBCEDXZE7Ewd5R3qxAcRa0UFk2EuvQInv7zyKKKovbWSTehtj2sODaTOPBSb6aKZH+n9WRX1P
secoE5X9tNTh1LQs2ZmCTBwXt2PBRNJgc2BDSRKX80cfStwuWb60CI/7VBFIXk5PmlQ68Pf74D1a
6wuuQY4o90ribwAcVg8eN7satZiB60YEEUZ+5WZTqJtaBC1XFJwkDEd3GIN4/gbsIWsRE3VVU9hJ
58RLW5904y7DDnhM35FZXIJwZyLiJMSHnrxnxqR2LLrK/jObBr3AG2ek+tRgQvarO+jXuLiebc4F
GNJ0NIXG6UPrLEtviWn82Po36d5XfphFBmhvGu5PclOGx+zfwd+vB0QZi6SKtEERmLjIKDYc/RgX
5E5yhsORLktCy6HA1GQG5xfaaQOT26aBYWkuSZNxDYChEVsEZcLCUdtCqapEsLqAlKFDxvkDHnHC
SXLRQUCHzRXbWL+N+MMkU8qmyR2lgExW8vYDiZnjxEuv15c22I3273TnQejkQDeGlGl6OYXlYkxa
xEx77SzYx21WBRbcJa+Be2iksbc4f1eJ6gKZ51x3Hj4CWdT4Bnrst1u8yyAlEHEOg4KVC1hJiKKO
A6Zn1aR6H5jDouTmQy5YHYyPUci59pyQFB7GCd8xs+c55CVSK1ckusHq7nPMYnDrFjHsLHDBFSiB
3nFLqVlXkUhTJW6MwO4oeLmdD26JTcXo2GsB1amSCJ6pDksVblepQ1CkIKXv4koqZsic8R663xcz
bb8gjjN3XqprSlDE4Zv9J7mZtfYKoUkMOHdEatrrVenEGHtid4TQi8jbp0jLqBvTPlXdQUSToOSi
xGNFkUNGmD7nj8QmLcJI3B2UCJAk+lb6WcU5qemGZ6HKtJ1ZN+rhYnxtAqvLOdHLiEp0ZEO6spSU
vqpE3jEbVkKkjlMtuc/39Ynl/xdyRThQkHkwrnA=


--===============1961025264==--