summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-09-19 20:00:01 +0200
committerunknown <msvensson@shellback.(none)>2006-09-19 20:00:01 +0200
commit8776c21f65a05253395b5ae6327c26d22c8b50f8 (patch)
tree250959a801669e7fcf50af5a6960c6ff41f4e483 /mysql-test/mysql-test-run.pl
parentd1ec10fbbe7d2db27363db1081442015a025551f (diff)
parenta4b1695376eeb3707fd1f42dc231067209faa58b (diff)
downloadmariadb-git-8776c21f65a05253395b5ae6327c26d22c8b50f8.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
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index dd93ea33ffc..0e8d54d872e 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -850,7 +850,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