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

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

Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
e919f8e8 · msvensson@neptunus.(none) · 674ee598 · 56acf0a0 · e919f8e8
Commit e919f8e8 authored Feb 21, 2006 by msvensson@neptunus.(none)
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

libmysql/libmysql.c libmysql/libmysql.c +5 -1

No files found.
--- 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);
 }