Merge branch '2.2' into develop

2018-09-27 11:40:14 +03:00
parent df3d08b959 62ce6c15dc
commit 66227301aa
15 changed files with 281 additions and 28 deletions
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@ -543,8 +543,7 @@ SRWBackend RWSplitSession::get_hinted_backend(char* name)

        /** The server must be a valid slave, relay server, or master */
        if ((backend->in_use() || (can_recover_servers() && backend->can_connect()))
-            && strcasecmp(name, backend->name()) == 0
-            && (backend->is_slave() || backend->is_relay() || backend->is_master()))
+            && strcasecmp(name, backend->name()) == 0)
        {
            rval = backend;
            break;