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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-05-08 10:30:13 +03:00
parent c818b1208a 0638ea736e
commit bad96e411a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -46,6 +46,7 @@
#include <maxscale/service.hh> #include <maxscale/service.hh>
#include <maxscale/utils.h> #include <maxscale/utils.h>
#include <maxscale/version.h> #include <maxscale/version.h>
#include <maxscale/routingworker.hh>
using std::string; using std::string;
using std::vector; using std::vector;
@ -6306,7 +6307,11 @@ static int blr_slave_send_heartbeat(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave
} }
/* Write the packet */ /* Write the packet */
return MXS_SESSION_ROUTE_REPLY(slave->dcb->session, h_event); mxs::RoutingWorker* worker = (mxs::RoutingWorker*)slave->dcb->owner;
worker->execute([slave, h_event]() {
MXS_SESSION_ROUTE_REPLY(slave->dcb->session, h_event);
}, mxs::RoutingWorker::EXECUTE_AUTO);
return 1;
} }
/** /**