Manual merge from master to develop. Incliding fix for bug #425 http://bugs.skysql.com/show_bug.cgi?id=425

2014-05-21 15:41:39 +03:00
parent c5ec3cbc57
commit c28052d5a4
7 changed files with 186 additions and 102 deletions
--- a/server/modules/include/readwritesplit.h
+++ b/server/modules/include/readwritesplit.h
@ -192,6 +192,7 @@ struct router_client_session {
        int              rses_capabilities; /*< input type, for example */
        bool             rses_autocommit_enabled;
        bool             rses_transaction_active;
+        uint64_t         rses_id; /*< ID for router client session */
        struct router_client_session* next;
 #if defined(SS_DEBUG)
        skygw_chk_t      rses_chk_tail;