Merge branch '2.3' into 2.4

2019-06-27 08:53:33 +03:00
parent c8145f94c9 5eba688c1b
commit fcc19f3c66
9 changed files with 163 additions and 49 deletions
--- a/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
@ -128,7 +128,7 @@ void RWSplitSession::process_sescmd_response(RWBackend* backend, GWBUF** ppPacke
                {
                    /** Map the returned response to the internal ID */
                    MXS_INFO("PS ID %u maps to internal ID %lu", resp.id, id);
-                    m_qc.ps_id_internal_put(resp.id, id);
+                    m_qc.ps_store_response(id, *ppPacket);
                }

                // Discard any slave connections that did not return the same result