Commit f05cccab authored by unknown's avatar unknown
Browse files

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

into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged
parents 81df6ecd a4b16953

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ sub command_line_setup () { 
  if ( ! $opt_suite_timeout )

  {

    $opt_suite_timeout= $default_suite_timeout;

    $opt_suite_timeout*= 4 if defined $opt_valgrind;

    $opt_suite_timeout*= 6 if defined $opt_valgrind;

  }



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