bzr commit into mysql-6.0-mtr branch (Bjorn.Munch:2752)

[Bjorn Munch]

#At file:///home/bm136801/mysql/retcnt-60/

 2752 Bjorn Munch	2009-03-31 [merge]
      merge
      modified:
        mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-03-24 11:53:24 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-03-31 11:20:10 +0000
@@ -526,6 +526,7 @@ sub run_test_server ($$$) {
 	      }
 	    }
 	    $num_saved_datadir++;
+	    $num_failed_test++ unless $result->{retries};
 
 	    if ( !$opt_force ) {
 	      # Test has failed, force is off
@@ -540,7 +541,6 @@ sub run_test_server ($$$) {
 			 "Terminating...");
 	      return undef;
 	    }
-	    $num_failed_test++;
 	  }
 
 	  # Retry test run after test failure