Commit e36762ea authored by unknown's avatar unknown
Browse files

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

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


libmysql/libmysql.c:
  Auto merged
parents ccec6f3e 7032a814

libmysql/libmysql.c

+5 −1
Original line number Diff line number Diff line
@@ -1370,8 +1370,12 @@ mysql_stat(MYSQL *mysql) 
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);

}