diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-20 18:02:42 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-20 18:02:42 +0200 |
| commit | 50756812cb27383af97ab81d834e4cc1a65e5f27 (patch) | |
| tree | 3f89d8733aeef9ce4f7b7307a29e257032b306d5 | |
| parent | 33985e7562e894560766559ec818cef4506d60d1 (diff) | |
| parent | 25fa9d266ae2b17d7224c68f9342a9993823901b (diff) | |
| download | mariadb-git-50756812cb27383af97ab81d834e4cc1a65e5f27.tar.gz | |
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
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0e8d54d872e..f1418446602 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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 |