Merge branch '2.1' into 2.2

2017-12-12 13:23:02 +02:00
parent 6485365b3b 7ebd487ef3
commit 79afaa447e
97 changed files with 5945 additions and 361 deletions
--- a/server/modules/routing/binlogrouter/blr_master.c
+++ b/server/modules/routing/binlogrouter/blr_master.c
@ -229,6 +229,7 @@ static void blr_start_master(void* data)
        return;
    }
    client->session = router->session;
+    client->service = router->service;

    /**
     * 'client' is the fake DCB that emulates a client session:
@ -265,6 +266,7 @@ static void blr_start_master(void* data)
        return;
    }
    router->master->remote = MXS_STRDUP_A(router->service->dbref->server->name);
+    router->master->service = router->service;

    MXS_NOTICE("%s: attempting to connect to master"
               " server [%s]:%d, binlog='%s', pos=%lu%s%s",