Merge branch '2.3' into 2.4

2019-07-10 08:14:56 +03:00
parent 4d5b9cae9c 8a176d64aa
commit f9b1a0a0c4
10 changed files with 89 additions and 17 deletions
--- a/include/maxscale/queryclassifier.hh
+++ b/include/maxscale/queryclassifier.hh
@ -415,5 +415,8 @@ private:
    RouteInfo         m_route_info;
    bool              m_trx_is_read_only;
    bool              m_ps_continuation;
+
+    uint32_t m_prev_ps_id = 0;      /**< For direct PS execution, storest latest prepared PS ID.
+                                     * https://mariadb.com/kb/en/library/com_stmt_execute/#statement-id **/
 };
 }