Merge branch '2.3' into develop

server/modules/routing/readwritesplit/rwsplit_route_stmt.cc

@@ -412,6 +412,13 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
 {
     if (mxs_mysql_is_ps_command(m_qc.current_route_info().command()))
     {
+        if (command == MXS_COM_STMT_CLOSE)
+        {
+            // Remove the command from the PS mapping
+            m_qc.ps_erase(querybuf);
+            m_exec_map.erase(m_qc.current_route_info().stmt_id());
+        }
+
         /**
          * Replace the ID with our internal one, the backends will replace it with their own ID
          * when the packet is being written. We use the internal ID when we store the command
@@ -519,6 +526,11 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
         {
             m_sescmd_responses.erase(m_sescmd_responses.begin(), it);
         }
+        else
+        {
+            // All responses processed
+            m_sescmd_responses.clear();
+        }
     }
     else
     {

server/modules/routing/readwritesplit/rwsplitsession.hh

@@ -287,7 +287,6 @@ private:
     uint64_t                m_sent_sescmd;      /**< ID of the last sent session command*/
     uint64_t                m_recv_sescmd;      /**< ID of the most recently completed session
                                                  * command */
-    ClientHandleMap m_ps_handles;               /**< Client PS handle to internal ID mapping */
     ExecMap         m_exec_map;                 /**< Map of COM_STMT_EXECUTE statement IDs to
                                                  * Backends */
     std::string          m_gtid_pos;            /**< Gtid position for causal read */