Commit cd38313c authored by unknown's avatar unknown
Browse files

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

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
parents 2e5a6f9e c0612e45

client/mysqltest.c

+4 −2
Original line number Diff line number Diff line
@@ -2979,10 +2979,12 @@ void safe_connect(MYSQL* mysql, const char *name, const char *host, 
      Connect failed



      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)

      my_sleep(connection_retry_sleep);

    else