Fix for MDEV-10361: Don't try to reconnect twice: if mysql->options.r…

…econnect is set, ma_simple_command already tries to reconnect, so there is no need to reconnect in mysql_ping again
mariadb-corporation · Jan 16, 2018 · 1512448 · 1512448
1 parent 6ad7e50
commit 1512448
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/libmariadb/libmariadb.c b/libmariadb/libmariadb.c
@@ -2897,10 +2897,7 @@ mysql_ping(MYSQL *mysql)
   DBUG_ENTER("mysql_ping");
   rc= simple_command(mysql,MYSQL_COM_PING,0,0,0,0);
 
-  /* if connection was terminated and reconnect is true, try again */
-  if (rc!=0  && mysql->reconnect)
-    rc= simple_command(mysql,MYSQL_COM_PING,0,0,0,0);
-  return rc;
+  DBUG_RETURN(rc);
 }