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/schemarouter/schemaroutersession.cc
+++ b/server/modules/routing/schemarouter/schemaroutersession.cc
@ -424,7 +424,7 @@ int32_t SchemaRouterSession::routeQuery(GWBUF* pPacket)
        /** We know where to route this query */
        SSRBackend bref = get_bref_from_dcb(target_dcb);

-        if (op == QUERY_OP_LOAD)
+        if (op == QUERY_OP_LOAD_LOCAL)
        {
            m_load_target = bref->backend()->server;
        }