Merge branch '2.2' into develop

2018-06-04 16:00:19 +03:00
parent a16d8c2ca0 9d0b1be08b
commit 4a3216d483
14 changed files with 113 additions and 24 deletions
--- a/server/modules/routing/readconnroute/readconnroute.cc
+++ b/server/modules/routing/readconnroute/readconnroute.cc
@ -344,7 +344,7 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session)

                    continue;
                }
-                if (ref == master_host && (inst->bitvalue & SERVER_MASTER))
+                if (ref == master_host && inst->bitvalue == SERVER_MASTER)
                {
                    /* If option is "master" return only the root Master as there could be
                     * intermediate masters (Relay Servers) and they must not be selected.