From d4a9ed4b5086d5fed8eeaa1ac5af40b34c2baadf Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.mysql.com>
Date: Thu, 24 Apr 2008 14:15:15 +0200
Subject: [PATCH] Replace all - with - in $opt name

---
 mysql-test/lib/mtr_cases.pm  |  2 +-
 mysql-test/lib/mtr_report.pm | 34 +++++++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 0f8329f2f31..f46c0165e27 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -46,7 +46,7 @@ sub collect_option {
   my ($opt, $value)= @_;
 
   # Convert - to _ in option name
-  $opt =~ s/-/_/;
+  $opt =~ s/-/_/g;
   no strict 'refs';
   ${$opt}= $value;
 }
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm
index a3c0f26c8fd..84c3c0dc226 100644
--- a/mysql-test/lib/mtr_report.pm
+++ b/mysql-test/lib/mtr_report.pm
@@ -26,8 +26,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line
 		mtr_print_header mtr_report mtr_report_stats
 		mtr_warning mtr_error mtr_debug mtr_verbose
 		mtr_verbose_restart mtr_report_test_passed
-		mtr_report_test_failed mtr_report_test_skipped
-		mtr_report_stats);
+		mtr_report_test_failed mtr_report_test_skipped);
 
 use mtr_match;
 require "mtr_io.pl";
@@ -35,12 +34,13 @@ require "mtr_io.pl";
 my $tot_real_time= 0;
 
 our $timestamp= 0;
+our $timediff= 1;
 
 sub report_option {
   my ($opt, $value)= @_;
 
   # Convert - to _ in option name
-  $opt =~ s/-/_/;
+  $opt =~ s/-/_/g;
   no strict 'refs';
   ${$opt}= $value;
 }
@@ -228,20 +228,20 @@ sub mtr_report_stats ($) {
   # Print a list of check_testcases that failed(if any)
   if ( $::opt_check_testcases )
   {
-    my @check_testcases= ();
+    my %check_testcases;
 
     foreach my $tinfo (@$tests)
     {
       if ( defined $tinfo->{'check_testcase_failed'} )
       {
-	push(@check_testcases, $tinfo->{'name'});
+	$check_testcases{$tinfo->{'name'}}= 1;
       }
     }
 
-    if ( @check_testcases )
+    if ( keys %check_testcases )
     {
       print "Check of testcase failed for: ";
-      print join(" ", @check_testcases);
+      print join(" ", keys %check_testcases);
       print "\n\n";
     }
   }
@@ -330,13 +330,29 @@ sub mtr_print_header () {
 
 use Time::localtime;
 
+use Time::HiRes qw(gettimeofday);
+
+my $t0= gettimeofday();
+
 sub _timestamp {
   return "" unless $timestamp;
 
+  my $diff;
+  if ($timediff){
+    my $t1= gettimeofday();
+    my $elapsed= $t1 - $t0;
+
+    $diff= sprintf(" +%02.3f", $elapsed);
+
+    # Save current time for next lap
+    $t0= $t1;
+
+  }
+
   my $tm= localtime();
-  return sprintf("%02d%02d%02d %2d:%02d:%02d ",
+  return sprintf("%02d%02d%02d %2d:%02d:%02d%s ",
 		 $tm->year % 100, $tm->mon+1, $tm->mday,
-		 $tm->hour, $tm->min, $tm->sec);
+		 $tm->hour, $tm->min, $tm->sec, $diff);
 }