From 9dce0d728c2cdb8310a5907222890d72f7dca6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?= Date: Fri, 23 Oct 2020 13:51:22 +0200 Subject: [PATCH] Fixed typo mistaking supplied '_myds' for internal 'MySQL_Resulset::myds' --- lib/MySQL_Protocol.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/MySQL_Protocol.cpp b/lib/MySQL_Protocol.cpp index 2c42abb76..c92a03221 100644 --- a/lib/MySQL_Protocol.cpp +++ b/lib/MySQL_Protocol.cpp @@ -2634,15 +2634,15 @@ void MySQL_ResultSet::add_err(MySQL_Data_Stream *_myds) { if (_myds && _myds->killed_at) { // see case #750 if (_myds->kill_type == 0) { myprot->generate_pkt_ERR(false,&pkt.ptr,&pkt.size,sid,1907,sqlstate,(char *)"Query execution was interrupted, query_timeout exceeded"); - MyHGM->p_update_mysql_error_counter(p_mysql_error_type::proxysql, myds->myconn->parent->myhgc->hid, myds->myconn->parent->address, myds->myconn->parent->port, 1907); + MyHGM->p_update_mysql_error_counter(p_mysql_error_type::proxysql, _myds->myconn->parent->myhgc->hid, _myds->myconn->parent->address, _myds->myconn->parent->port, 1907); } else { myprot->generate_pkt_ERR(false,&pkt.ptr,&pkt.size,sid,1317,sqlstate,(char *)"Query execution was interrupted"); - MyHGM->p_update_mysql_error_counter(p_mysql_error_type::proxysql, myds->myconn->parent->myhgc->hid, myds->myconn->parent->address, myds->myconn->parent->port, 1317); + MyHGM->p_update_mysql_error_counter(p_mysql_error_type::proxysql, _myds->myconn->parent->myhgc->hid, _myds->myconn->parent->address, _myds->myconn->parent->port, 1317); } } else { myprot->generate_pkt_ERR(false,&pkt.ptr,&pkt.size,sid,mysql_errno(_mysql),sqlstate,mysql_error(_mysql)); // TODO: Check this is a mysql error - MyHGM->p_update_mysql_error_counter(p_mysql_error_type::mysql, myds->myconn->parent->myhgc->hid, myds->myconn->parent->address, myds->myconn->parent->port, mysql_errno(_mysql)); + MyHGM->p_update_mysql_error_counter(p_mysql_error_type::mysql, _myds->myconn->parent->myhgc->hid, _myds->myconn->parent->address, _myds->myconn->parent->port, mysql_errno(_mysql)); } PSarrayOUT.add(pkt.ptr,pkt.size); sid++;