Commit 3ee8478b authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
parents f978434f bb5457ae

client/mysqltest.c

+5 −0
Original line number Diff line number Diff line
@@ -2977,7 +2977,12 @@ void safe_connect(MYSQL* mysql, const char *name, const char *host, 
    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)