Merge branch '2.2' into develop

2018-09-20 12:16:55 +03:00
parent 795796c8a2 8c2f6aafcc
commit d8d0b1a29c
9 changed files with 19 additions and 9 deletions
--- a/server/modules/authenticator/MySQLAuth/dbusers.cc
+++ b/server/modules/authenticator/MySQLAuth/dbusers.cc
@ -1046,7 +1046,8 @@ static int get_users(SERV_LISTENER* listener, bool skip_local)
    for (server = service->dbref; !maxscale_is_shutting_down() && server; server = server->next)
    {
        if (!SERVER_REF_IS_ACTIVE(server) || !server_is_active(server->server)
-            || (skip_local && server_is_mxs_service(server->server)))
+            || (skip_local && server_is_mxs_service(server->server))
+            || !server_is_running(server->server))
        {
            continue;
        }