mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
into neptunus.(none):/home/msvensson/mysql/mysql-5.0 libmysql/libmysql.c: Auto merged
This commit is contained in:
commit
e36762ead8
1 changed files with 5 additions and 1 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue