Merge branch '2.1-oracle-compat' into develop-new-merge-oracle

2017-06-28 22:30:16 +02:00
parent 14bb6cf99b 7f1a949198
commit 6cd6ded3d8
88 changed files with 15138 additions and 745 deletions
--- a/include/maxscale/session.h
+++ b/include/maxscale/session.h
@ -146,6 +146,7 @@ typedef struct session
    int                     refcount;         /*< Reference count on the session */
    mxs_session_trx_state_t trx_state;        /*< The current transaction state. */
    bool                    autocommit;       /*< Whether autocommit is on. */
+    intptr_t                client_protocol_data; /*< Owned and managed by the client protocol. */
    struct
    {
        GWBUF *buffer; /**< Buffer containing the statement */