From 7ad078aebfe9d173fbe6fec1c245341a49e15030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 26 Jun 2017 12:03:40 +0200 Subject: [PATCH] Final fix for #1061 --- lib/MySQL_HostGroups_Manager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp index ce4411671..3b0d0e645 100644 --- a/lib/MySQL_HostGroups_Manager.cpp +++ b/lib/MySQL_HostGroups_Manager.cpp @@ -73,9 +73,9 @@ static void * HGCU_thread_run() { int i; for (i=0;i<(int)l;i++) { myconn=(MySQL_Connection *)conn_array->index(i); - if (myconn->mysql->net.vio) { + if (myconn->mysql->net.vio && myconn->mysql->net.fd && myconn->mysql->net.buff) { statuses[i]=mysql_change_user_start(&ret[i], myconn->mysql, myconn->userinfo->password, myconn->userinfo->password, myconn->userinfo->schemaname); - if (myconn->mysql->net.vio==0) { + if (myconn->mysql->net.vio==NULL || myconn->mysql->net.fd==0 || myconn->mysql->net.buff==NULL) { statuses[i]=0; ret[i]=1; } } else { @@ -103,12 +103,12 @@ static void * HGCU_thread_run() { usleep(50); for (i=0;i<(int)conn_array->len;i++) { myconn=(MySQL_Connection *)conn_array->index(i); - if (myconn->mysql->net.vio) { + if (myconn->mysql->net.vio && myconn->mysql->net.fd && myconn->mysql->net.buff) { statuses[i]=wait_for_mysql(myconn->mysql, statuses[i]); - if (myconn->mysql->net.vio) { + if (myconn->mysql->net.vio && myconn->mysql->net.fd && myconn->mysql->net.buff) { if ((statuses[i] & MYSQL_WAIT_TIMEOUT) == 0) { statuses[i]=mysql_change_user_cont(&ret[i], myconn->mysql, statuses[i]); - if (myconn->mysql->net.vio==0) { + if (myconn->mysql->net.vio==NULL || myconn->mysql->net.fd==0 || myconn->mysql->net.buff==NULL ) { statuses[i]=0; ret[i]=1; } }