Revert "Fix for MDEV-10361: Don't try to reconnect twice: if mysql->o…

…ptions.reconnect is set," This reverts commit 739bdc8.
mariadb-corporation · Jan 16, 2018 · 6ad7e50 · 6ad7e50
1 parent 739bdc8
commit 6ad7e50
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/libmariadb/libmariadb.c b/libmariadb/libmariadb.c
@@ -2896,6 +2896,11 @@ mysql_ping(MYSQL *mysql)
   int rc;
   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;
 }