Merge branch '2.2' into 2.3

2018-12-17 23:52:56 +02:00
parent 208a1d011e 0b67a22add
commit 35d31801bb
9 changed files with 85 additions and 17 deletions
--- a/server/modules/routing/readwritesplit/rwsplitsession.hh
+++ b/server/modules/routing/readwritesplit/rwsplitsession.hh
@ -149,7 +149,6 @@ public:
    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 */