Merge branch '2.3' into develop

2018-12-18 00:00:00 +02:00
parent 405b4de1dd 35d31801bb
commit 5a9e84d39a
12 changed files with 88 additions and 19 deletions
--- a/server/modules/routing/readwritesplit/rwsplitsession.hh
+++ b/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 */