From 68baa871be2faa3950ec1c971deb861dff6595d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?= Date: Mon, 18 Apr 2022 10:04:11 +0200 Subject: [PATCH] Fix duplicate counting of MySQL errors for client conns --- lib/MySQL_Session.cpp | 6 ------ lib/mysql_connection.cpp | 1 - 2 files changed, 7 deletions(-) diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp index fd75df06f..838b26e46 100644 --- a/lib/MySQL_Session.cpp +++ b/lib/MySQL_Session.cpp @@ -6727,7 +6727,6 @@ void MySQL_Session::MySQL_Stmt_Result_to_MySQL_wire(MYSQL_STMT *stmt, MySQL_Conn MYSQL *mysql=stmt->mysql; // no result set int myerrno=mysql_stmt_errno(stmt); - MyHGM->p_update_mysql_error_counter(p_mysql_error_type::mysql, myconn->parent->myhgc->hid, myconn->parent->address, myconn->parent->port, myerrno); if (myerrno==0) { unsigned int num_rows = mysql_affected_rows(stmt->mysql); unsigned int nTrx=NumActiveTransactions(); @@ -6810,11 +6809,6 @@ void MySQL_Session::MySQL_Result_to_MySQL_wire(MYSQL *mysql, MySQL_ResultSet *My //client_myds->pkt_sid++; } else { // error - if (_myds) { - if (_myds->myconn) { - MyHGM->p_update_mysql_error_counter(p_mysql_error_type::mysql, _myds->myconn->parent->myhgc->hid, _myds->myconn->parent->address, _myds->myconn->parent->port, myerrno); - } - } char sqlstate[10]; sprintf(sqlstate,"%s",mysql_sqlstate(mysql)); if (_myds && _myds->killed_at) { // see case #750 diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp index 814d151f9..50d95d838 100644 --- a/lib/mysql_connection.cpp +++ b/lib/mysql_connection.cpp @@ -274,7 +274,6 @@ void MySQL_Connection::compute_unknown_transaction_status() { unknown_transaction_status = false; // no error return; } - MyHGM->p_update_mysql_error_counter(p_mysql_error_type::mysql, parent->myhgc->hid, parent->address, parent->port, _myerrno); if (_myerrno >= 2000 && _myerrno < 3000) { // client error // do not change it return;