Merge branch '2.3' into 2.4

server/modules/routing/readwritesplit/rwsplit_route_stmt.cc

@@ -822,10 +822,8 @@ RWBackend* RWSplitSession::handle_slave_is_target(uint8_t cmd, uint32_t stmt_id)
     int rlag_max = get_max_replication_lag();
     RWBackend* target = nullptr;
 
-    if (cmd == MXS_COM_STMT_FETCH)
+    if (m_qc.is_ps_continuation())
     {
-        /** The COM_STMT_FETCH must be executed on the same server as the
-         * COM_STMT_EXECUTE was executed on */
         ExecMap::iterator it = m_exec_map.find(stmt_id);
 
         if (it != m_exec_map.end())

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