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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2019-12-13 11:24:42 +02:00
parent c1b5d70eea e057c751cd
commit ad323bb837
6 changed files with 151 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/dcb.cc
View File

@ -1972,7 +1972,9 @@ static void dcb_hangup_foreach_worker(MXB_WORKER* worker, struct SERVER* server)
if (!dcb->dcb_errhandle_called)
{
this_thread.current_dcb = dcb;
dcb->is_fake_event = true;
dcb->func.hangup(dcb);
dcb->is_fake_event = false;
dcb->dcb_errhandle_called = true;
}
}
@ -2801,7 +2803,9 @@ static uint32_t dcb_handler(DCB* dcb, uint32_t events)
events = dcb->fake_event;
dcb->fake_event = 0;
dcb->is_fake_event = true;
rv |= dcb_process_poll_events(dcb, events);
dcb->is_fake_event = false;
}
this_thread.current_dcb = NULL;