bk commit into 4.1 tree (msvensson:1.2589) BUG#20225

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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, 2006-12-11 15:39:15+01:00, msvensson@neptunus.(none) +1 -0
  Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite
   - Add printout in safe_connect indicating that mysqltest is in a loop waiting for
  connection to mysqld. Will be printed when --verbose is passed as argument to
    mysqltest

  client/mysqltest.c@stripped, 2006-12-11 15:39:13+01:00, msvensson@neptunus.(none) +5 -0
    Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite
     - Add printout in safe_connect indicating that mysqltest is in a loop waiting for
    connection to mysqld 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.231/client/mysqltest.c	2006-12-11 15:39:18 +01:00
+++ 1.232/client/mysqltest.c	2006-12-11 15:39:18 +01:00
@@ -2970,7 +2970,12 @@ void safe_connect(MYSQL* mysql, const ch
     if ((mysql_errno(mysql) == CR_CONN_HOST_ERROR ||
          mysql_errno(mysql) == CR_CONNECTION_ERROR) &&
         failed_attempts < opt_max_connect_retries)
+    {
+      verbose_msg("Connect attempt %d/%d failed: %d: %s", failed_attempts,
+                  opt_max_connect_retries, mysql_errno(mysql),
+                  mysql_error(mysql));
       my_sleep(connection_retry_sleep);
+    }
     else
     {
       if (failed_attempts > 0)