List:Commits« Previous MessageNext Message »
From:msvensson Date:December 4 2006 2:48pm
Subject:bk commit into 4.1 tree (msvensson:1.2576) BUG#24389
View as plain text  
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-04 15:48:34+01:00, msvensson@neptunus.(none) +1 -0
  Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL
   - Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
     attempt in mysqltest

  client/mysqltest.c@stripped, 2006-12-04 15:48:32+01:00, msvensson@neptunus.(none) +4 -2
    Add CR_CONN_HOST_ERROR to errorcodes that trigger a reconnect

# 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.226/client/mysqltest.c	2006-12-04 15:48:37 +01:00
+++ 1.227/client/mysqltest.c	2006-12-04 15:48:37 +01:00
@@ -2959,10 +2959,12 @@ void safe_connect(MYSQL* mysql, const ch
       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
Thread
bk commit into 4.1 tree (msvensson:1.2576) BUG#24389msvensson4 Dec