Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

1 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ae4136b5494..8321cbdedfa 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1494,15 +1494,15 @@ sub run_testcase ($) {
     {
       mtr_report_test_passed($tinfo);
     }
-    elsif ( $res == 2 )
+    elsif ( $res == 62 )
     {
       # Testcase itself tell us to skip this one
       mtr_report_test_skipped($tinfo);
     }
     else
     {
-      # Test case failed
-      if ( $res > 2 )
+      # Test case failed, if in control mysqltest returns 1
+      if ( $res != 1 )
       {
         mtr_tofile($path_timefile,
                    "mysqltest returned unexpected code $res, " .
@@ -2126,7 +2126,7 @@ sub run_mysqltest ($$) {
     mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]);
   }
 
-  return mtr_run_test($exe_mysqltest,$args,$tinfo->{'path'},"",$path_timefile,"");
+  return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
 }
 
 ##############################################################################