Merge branch '2.2' into develop

2018-05-18 12:45:15 +03:00
parent 91cc5b1e89 3cb389a3b5
commit df7c46fbdd
6 changed files with 28 additions and 1 deletions
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@ -349,11 +349,11 @@ bool RWSplitSession::route_session_write(GWBUF *querybuf, uint8_t command, uint3
    bool expecting_response = mxs_mysql_command_will_respond(command);
    int nsucc = 0;
    uint64_t lowest_pos = id;
+    gwbuf_set_type(querybuf, GWBUF_TYPE_COLLECT_RESULT);

    if (qc_query_is_type(type, QUERY_TYPE_PREPARE_NAMED_STMT) ||
        qc_query_is_type(type, QUERY_TYPE_PREPARE_STMT))
    {
-        gwbuf_set_type(querybuf, GWBUF_TYPE_COLLECT_RESULT);
        m_qc.ps_store(querybuf, id);
    }