Bug #48130 Expected failures should not count towards max-test-fail

Test batches may be terminated too early
Avoid counting exp-fail tests

mysql-test/lib/mtr_report.pm

@@ -146,6 +146,7 @@ sub mtr_report_test ($) {
           }
         }
         $fail = "exp-fail";
+        $tinfo->{exp_fail}= 1;
         last;
       }
     }

mysql-test/mysql-test-run.pl

@@ -519,7 +519,8 @@ sub run_test_server ($$$) {
 	      }
 	    }
 	    $num_saved_datadir++;
-	    $num_failed_test++ unless $result->{retries};
+	    $num_failed_test++ unless ($result->{retries} ||
+                                       $result->{exp_fail});
 
 	    if ( !$opt_force ) {
 	      # Test has failed, force is off