Merge from develop

2014-06-26 17:08:21 +02:00
parent 4d2e43a2d9 10ac2cb6e6
commit 1a33277f72
24 changed files with 1543 additions and 530 deletions
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@ -114,7 +114,7 @@ static  void    clientReply(
 static  void    handleError(
        ROUTER  *instance,
        void    *router_session,
-        char    *message,
+        GWBUF   *errbuf,
        DCB     *backend_dcb,
        int     action,
        bool    *succp);
@ -725,7 +725,7 @@ static  void
 handleError(
        ROUTER *instance,
        void   *router_session,
-        char   *message,
+        GWBUF  *errbuf,
        DCB    *backend_dcb,
        int     action,
        bool   *succp)