bk commit into 5.1 tree (msvensson:1.2626)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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, 2008-05-04 21:21:11+02:00, msvensson@stripped +1 -0
  Correctly calculate failed tests

  mysql-test/lib/mtr_report.pm@stripped, 2008-05-04 21:21:04+02:00, msvensson@stripped +13 -8
    Correctly calculate failed tests

diff -Nrup a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm
--- a/mysql-test/lib/mtr_report.pm	2008-05-02 12:11:02 +02:00
+++ b/mysql-test/lib/mtr_report.pm	2008-05-04 21:21:04 +02:00
@@ -222,22 +222,27 @@ sub mtr_report_stats ($) {
 
   foreach my $tinfo (@$tests)
   {
-    if ( $tinfo->{'result'} eq 'MTR_RES_SKIPPED' )
+    if ( $tinfo->{failures} )
     {
+      # Test has failed at least one time
+      $tot_tests++;
+      $tot_failed++;
+    }
+    elsif ( $tinfo->{'result'} eq 'MTR_RES_SKIPPED' )
+    {
+      # Test was skipped
       $tot_skiped++;
     }
     elsif ( $tinfo->{'result'} eq 'MTR_RES_PASSED' )
     {
+      # Test passed
       $tot_tests++;
       $tot_passed++;
     }
-    elsif ( $tinfo->{failures} )
-    {
-      $tot_tests++;
-      $tot_failed++;
-    }
+
     if ( $tinfo->{'restarted'} )
     {
+      # Servers was restarted
       $tot_restarts++;
     }
 
@@ -302,7 +307,7 @@ sub mtr_report_stats ($) {
 
     # Print each failed test, again
     #foreach my $test ( @$tests ){
-    #  if ( $test->{result} eq 'MTR_RES_FAILED' ) {
+    #  if ( $test->{failures} ) {
     #    mtr_report_test($test);
     #  }
     #}
@@ -320,7 +325,7 @@ sub mtr_report_stats ($) {
     foreach my $tinfo (@$tests)
     {
       my $tname= $tinfo->{'name'};
-      if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' and ! $seen{$tname})
+      if ( $tinfo->{failures} and ! $seen{$tname})
       {
         print " $tname";
 	$seen{$tname}= 1;