1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2006-12-04 19:36:53 +01:00
commit cd38313c5c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqltest.c
View File

@ -2979,10 +2979,12 @@ void safe_connect(MYSQL* mysql, const char *name, const char *host,
Connect failed Connect failed
Only allow retry if this was an error indicating the server Only allow retry if this was an error indicating the server
could not be contacted could not be contacted. Error code differs depending
on protocol/connection type
*/ */
if (mysql_errno(mysql) == CR_CONNECTION_ERROR && if ((mysql_errno(mysql) == CR_CONN_HOST_ERROR ||
mysql_errno(mysql) == CR_CONNECTION_ERROR) &&
failed_attempts < opt_max_connect_retries) failed_attempts < opt_max_connect_retries)
my_sleep(connection_retry_sleep); my_sleep(connection_retry_sleep);
else else