diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-21 08:50:26 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-21 08:50:26 +0100 |
| commit | e36762ead833d201d47f40aa5c603a7bb4122e68 (patch) | |
| tree | aacf52fd8b036de38abb627c03c95c4bb8b79e18 /libmysql | |
| parent | ccec6f3e9f4e4eabb0aef2bbb5a0cca4bea41298 (diff) | |
| parent | 7032a814f2884a3d56dedbcff9a08ba9157ced05 (diff) | |
| download | mariadb-git-e36762ead833d201d47f40aa5c603a7bb4122e68.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 37566b2dfaa..3a532965551 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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); } |