Merge branch '2.2' into develop

2018-06-13 00:25:56 +03:00
parent 780620e796 e99d9826ad
commit 8094c67ac2
12 changed files with 154 additions and 78 deletions
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@ -360,6 +360,10 @@ bool RWSplitSession::route_session_write(GWBUF *querybuf, uint8_t command, uint3
    {
        m_qc.ps_store(querybuf, id);
    }
+    else if (qc_query_is_type(type, QUERY_TYPE_DEALLOC_PREPARE))
+    {
+        m_qc.ps_erase(querybuf);
+    }

    MXS_INFO("Session write, routing to all servers.");