Commit 800e6b00 authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057

into  neptunus.(none):/home/msvensson/mysql/bug14057/my51-bug14057


libmysql/libmysql.c:
  Auto merged
parents d1f0fc82 7032a814
...@@ -1364,8 +1364,12 @@ mysql_stat(MYSQL *mysql) ...@@ -1364,8 +1364,12 @@ mysql_stat(MYSQL *mysql)
int STDCALL int STDCALL
mysql_ping(MYSQL *mysql) mysql_ping(MYSQL *mysql)
{ {
int res;
DBUG_ENTER("mysql_ping"); 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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment