Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
This commit is contained in:
commit
bb5457ae7a
@ -2976,7 +2976,12 @@ void safe_connect(MYSQL* mysql, const char *name, const char *host,
|
|||||||
if ((mysql_errno(mysql) == CR_CONN_HOST_ERROR ||
|
if ((mysql_errno(mysql) == CR_CONN_HOST_ERROR ||
|
||||||
mysql_errno(mysql) == CR_CONNECTION_ERROR) &&
|
mysql_errno(mysql) == CR_CONNECTION_ERROR) &&
|
||||||
failed_attempts < opt_max_connect_retries)
|
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);
|
my_sleep(connection_retry_sleep);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (failed_attempts > 0)
|
if (failed_attempts > 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user