Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä
2019-07-02 08:38:15 +03:00
16 changed files with 75 additions and 29 deletions

View File

@ -448,6 +448,8 @@ bool mxs_worker_should_shutdown(MXB_WORKER* pWorker)
RoutingWorker* RoutingWorker::get(int worker_id)
{
mxb_assert(this_unit.initialized);
if (worker_id == MAIN)
{
worker_id = this_unit.id_main_worker;