bk commit into 5.0 tree (msvensson:1.2527)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-21 17:52:02+02:00, msvensson@shellback.(none) +1 -0
  - Increase default connect_timeout to avoid intermittent
  disconnects when test servers are put under load

  mysql-test/mysql-test-run.pl@stripped, 2007-09-21 17:51:59+02:00, msvensson@shellback.(none) +5 -0
    - Increase default connect_timeout to avoid intermittent
    disconnects when test servers are put under load

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-08-29 17:54:14 +02:00
+++ b/mysql-test/mysql-test-run.pl	2007-09-21 17:51:59 +02:00
@@ -3708,6 +3708,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);