hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-1.2' into develop

Browse Source 
Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c
This commit is contained in:
Markus Makela
2015-07-11 17:12:48 +03:00
parent 2fe6d837fc a6b35af9f6
commit 6497350ab7
39 changed files with 250 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/modules/protocol/mysql_backend.c
View File

@ -1091,7 +1091,7 @@ gw_backend_hangup(DCB *dcb)
len = sizeof(error);
if (getsockopt(dcb->fd, SOL_SOCKET, SO_ERROR, &error, (socklen_t *)&len) == 0)
{
if (error != 0)
if (error != 0 && ses_state != SESSION_STATE_STOPPING)
{
strerror_r(error, buf, 100);
LOGIF(LE, (skygw_log_write_flush(
@ -1105,9 +1105,12 @@ gw_backend_hangup(DCB *dcb)
goto retblock;
}
#if defined(SS_DEBUG)
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Backend hangup error handling.")));
if(ses_state != SESSION_STATE_STOPPING)
{
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Backend hangup error handling.")));
}
#endif
router->handleError(router_instance,