bk commit into 5.0 tree (msvensson:1.2021) BUG#14057

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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
  1.2021 06/02/16 13:44:56 msvensson@neptunus.(none) +1 -0
  Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different ways
   - Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST

  libmysql/libmysql.c
    1.231 06/02/16 13:44:52 msvensson@neptunus.(none) +5 -1
    Send a new ping if first ping fails with CR_SERVER_LOST and reconnect is turned on 

# 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/bug14057/my50-bug14057

--- 1.230/libmysql/libmysql.c	2005-08-04 13:25:02 +02:00
+++ 1.231/libmysql/libmysql.c	2006-02-16 13:44:52 +01:00
@@ -1370,8 +1370,12 @@
 int STDCALL
 mysql_ping(MYSQL *mysql)
 {
+  int res;
   DBUG_ENTER("mysql_ping");
-  DBUG_RETURN(simple_command(mysql,COM_PING,0,0,0));
+  res= simple_command(mysql,COM_PING,0,0,0);
+  if (res == CR_SERVER_LOST && mysql->reconnect)
+    res= simple_command(mysql,COM_PING,0,0,0);
+  DBUG_RETURN(res);
 }