Merge branch 'develop' into MAX-111

2014-06-26 16:52:57 +01:00
parent 031294f655 10ac2cb6e6
commit ace2550d93
17 changed files with 1273 additions and 484 deletions
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@ -113,7 +113,7 @@ static  void    clientReply(
 static  void    handleError(
        ROUTER  *instance,
        void    *router_session,
-        char    *message,
+        GWBUF   *errbuf,
        DCB     *backend_dcb,
        int     action,
        bool    *succp);
@ -708,7 +708,7 @@ static  void
 handleError(
        ROUTER *instance,
        void   *router_session,
-        char   *message,
+        GWBUF  *errbuf,
        DCB    *backend_dcb,
        int     action,
        bool   *succp)
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c