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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-04-18 09:36:17 +03:00
parent a2b78d40cf 474736584b
commit 99a9dd1006
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/dcb.cc
View File

@ -3458,7 +3458,7 @@ int poll_add_dcb(DCB *dcb)
worker_id = MXS_WORKER_ALL; worker_id = MXS_WORKER_ALL;
} }
else if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER && else if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER &&
(strcasecmp(dcb->service->routerModule, "cli") == 0)) strcasecmp(dcb->service->routerModule, "cli") == 0)
{ {
// If the DCB refers to an accepted maxadmin socket, we force it // If the DCB refers to an accepted maxadmin socket, we force it
// to the main thread. That's done in order to prevent a deadlock // to the main thread. That's done in order to prevent a deadlock

4
server/core/test/test_poll.cc
View File

@ -52,6 +52,9 @@ test1()
int eno = 0; int eno = 0;
SERV_LISTENER dummy; SERV_LISTENER dummy;
SERVICE service;
service.routerModule = (char*)"required by a check in dcb.cc";
/* Poll tests */ /* Poll tests */
ss_dfprintf(stderr, ss_dfprintf(stderr,
"testpoll : Initialise the polling system."); "testpoll : Initialise the polling system.");
@ -66,6 +69,7 @@ test1()
} }
dcb->fd = socket(AF_UNIX, SOCK_STREAM, 0); dcb->fd = socket(AF_UNIX, SOCK_STREAM, 0);
dcb->service = &service;
if (dcb->fd < 0) if (dcb->fd < 0)
{ {