From adf7b569e38214100adca8ae10cacda19ca6a64a Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 16 Jan 2018 15:24:54 +0100 Subject: [PATCH] Fix for MDEV-10361: Don't try to reconnect twice: if mysql->options.reconnect is set, ma_simple_command already tries to reconnect, so there is no need to reconnect in mysql_ping again --- libmariadb/mariadb_lib.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index d1d24df7..51451b98 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -2539,13 +2539,7 @@ mysql_stat(MYSQL *mysql) int STDCALL mysql_ping(MYSQL *mysql) { - int rc; - rc= ma_simple_command(mysql, COM_PING,0,0,0,0); - - /* if connection was terminated and reconnect is true, try again */ - if (rc!=0 && mysql->options.reconnect) - rc= ma_simple_command(mysql, COM_PING,0,0,0,0); - return rc; + return ma_simple_command(mysql, COM_PING,0,0,0,0); } char * STDCALL