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
This commit is contained in:
unknown 2006-09-20 15:45:42 +02:00
commit a880b2d311

View file

@ -909,13 +909,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