bk commit into 5.0 tree (msvensson:1.2501)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-03 12:50:00+02:00, msvensson@pilot.(none) +2 -0
  Improve report on test execution time
  Define tot_real_tim locally in mtr_report.pl

  mysql-test/lib/mtr_report.pl@stripped, 2007-08-03 12:49:59+02:00, msvensson@pilot.(none) +8 -3
    Improve report on test execution time
    Define tot_real_tim locally in mtr_report.pl

  mysql-test/mysql-test-run.pl@stripped, 2007-08-03 12:49:59+02:00, msvensson@pilot.(none) +0 -1
    Move global variable to local scope in the file it's being used

diff -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl	2007-06-21 16:37:12 +02:00
+++ b/mysql-test/lib/mtr_report.pl	2007-08-03 12:49:59 +02:00
@@ -38,6 +38,9 @@ sub mtr_child_error (@);
 sub mtr_debug (@);
 sub mtr_verbose (@);
 
+my $tot_real_time= 0;
+
+
 
 ##############################################################################
 #
@@ -142,7 +145,7 @@ sub mtr_report_test_passed ($) {
   if ( $::opt_timer and -f "$::opt_vardir/log/timer" )
   {
     $timer= mtr_fromfile("$::opt_vardir/log/timer");
-    $::glob_tot_real_time += ($timer/1000);
+    $tot_real_time += ($timer/1000);
     $timer= sprintf "%12s", $timer;
   }
   $tinfo->{'result'}= 'MTR_RES_PASSED';
@@ -243,8 +246,10 @@ sub mtr_report_stats ($) {
 
   if ( $::opt_timer )
   {
-    print
-      "Spent $::glob_tot_real_time seconds actually executing testcases\n"
+    use English;
+
+    mtr_report("Spent", sprintf("%.3f", $tot_real_time),"of",
+	       time - $BASETIME, "seconds executing testcases");
   }
 
   # ----------------------------------------------------------------------
diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-07-24 08:35:39 +02:00
+++ b/mysql-test/mysql-test-run.pl	2007-08-03 12:49:59 +02:00
@@ -307,7 +307,6 @@ our @data_dir_lst;
 our $used_binlog_format;
 our $used_default_engine;
 our $debug_compiled_binaries;
-our $glob_tot_real_time= 0;
 
 our %mysqld_variables;