From 089be56103689e40a5f5b72a4bd75c676d1f002e Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 1 Jun 2018 13:43:02 +0300
Subject: [PATCH] MXS-1889 Only turn on master bit for slaves

The bitmask ensures that the master bit would be ignored in
cases where it is not relevant, but nicer if it is set only
when it is relevant.
---
 server/modules/routing/readconnroute/readconnroute.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/modules/routing/readconnroute/readconnroute.c b/server/modules/routing/readconnroute/readconnroute.c
index 06846d123..278c65d24 100644
--- a/server/modules/routing/readconnroute/readconnroute.c
+++ b/server/modules/routing/readconnroute/readconnroute.c
@@ -405,7 +405,10 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session)
             //
             // We must do that so that readconnroute in MaxScale 2.2 will again behave
             // the same way as it did up until 2.1.12.
-            client_rses->bitvalue |= SERVER_MASTER;
+            if (client_rses->bitvalue & SERVER_SLAVE)
+            {
+                client_rses->bitvalue |= SERVER_MASTER;
+            }
         }
         else
         {