diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-21 08:49:21 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-21 08:49:21 +0100 |
| commit | 800e6b008d956850edd3781ed03d9a0fa646f8af (patch) | |
| tree | 5b0622c787522d05402c61482937922b5569c612 /libmysql | |
| parent | d1f0fc821c093c87a420266934e402441a8bab7b (diff) | |
| parent | 7032a814f2884a3d56dedbcff9a08ba9157ced05 (diff) | |
| download | mariadb-git-800e6b008d956850edd3781ed03d9a0fa646f8af.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
into neptunus.(none):/home/msvensson/mysql/bug14057/my51-bug14057
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 4b7aace549a..cf777cfc52b 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1364,8 +1364,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); } |