Commit 107bb8d8 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents ff753962 7a7e4d5d

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -2490,7 +2490,7 @@ sub run_suite () { 
      next;

    }



    mtr_timer_start($glob_timers,"testcase", $opt_testcase_timeout);

    mtr_timer_start($glob_timers,"testcase", 60 * $opt_testcase_timeout);

    run_testcase($tinfo);

    mtr_timer_stop($glob_timers,"testcase");

  }