Commit 50756812 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/work/my50-work 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 33985e75 25fa9d26

mysql-test/mysql-test-run.pl

+2 −2
Original line number Diff line number Diff line
@@ -844,13 +844,13 @@ sub command_line_setup () { 
  if ( ! $opt_testcase_timeout )

  {

    $opt_testcase_timeout= $default_testcase_timeout;

    $opt_testcase_timeout*= 10 if defined $opt_valgrind;

    $opt_testcase_timeout*= 10 if $opt_valgrind;

  }



  if ( ! $opt_suite_timeout )

  {

    $opt_suite_timeout= $default_suite_timeout;

    $opt_suite_timeout*= 6 if defined $opt_valgrind;

    $opt_suite_timeout*= 6 if $opt_valgrind;

  }



  # Increase times to wait for executables to start if using valgrind