Merge branch 'develop' into MAX-324

Conflicts: utils/skygw_utils.cc
2015-03-06 17:07:39 +02:00
parent 8cfd368e6b 8c3409cf32
commit 282f66f9fd
8 changed files with 68 additions and 6 deletions
--- a/server/modules/include/readwritesplit.h
+++ b/server/modules/include/readwritesplit.h
@ -290,6 +290,7 @@ struct router_client_session {
        int              rses_capabilities; /*< input type, for example */
        bool             rses_autocommit_enabled;
        bool             rses_transaction_active;
+        DCB* client_dcb;
 #if defined(PREP_STMT_CACHING)
        HASHTABLE*       rses_prep_stmt[2];
 #endif