summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2007-09-22 09:51:54 +0200
committerunknown <msvensson@shellback.(none)>2007-09-22 09:51:54 +0200
commitb1a33149a7cc44b02ebf4de76a5e85592d41a9ad (patch)
treed076227c02d7d5f8ac170bf37bf191934691d8e6 /mysql-test/mysql-test-run.pl
parent959dfa7f83d585e2490051ffbf234e954e727b84 (diff)
parent150953a36a9fd4985225380f9486788a039c5083 (diff)
downloadmariadb-git-b1a33149a7cc44b02ebf4de76a5e85592d41a9ad.tar.gz
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/my51-bug30843 BitKeeper/deleted/.del-configure.js: Auto merged client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged libmysql/libmysql.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/t/udf.test: Auto merged scripts/Makefile.am: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_select.cc: Auto merged sql/udf_example.def: Auto merged tests/mysql_client_test.c: Auto merged sql/udf_example.c: Merge 5.0->5.1
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f84da1ed132..7ad83087a5c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3742,6 +3742,11 @@ sub mysqld_arguments ($$$$) {
mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
+ # Increase default connect_timeout to avoid intermittent
+ # disconnects when test servers are put under load
+ # see BUG#28359
+ mtr_add_arg($args, "%s--connect-timeout=60", $prefix);
+
if ( $opt_valgrind_mysqld )
{
mtr_add_arg($args, "%s--skip-safemalloc", $prefix);