Merge branch 'develop' into MAX-99

Conflicts: server/modules/routing/readwritesplit/readwritesplit.c
2014-06-25 17:50:29 +03:00
parent dff18bf9bb 792ae454f4
commit 1d1da398d4
31 changed files with 1715 additions and 84 deletions
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@ -1415,7 +1415,7 @@ static void clientReply (
        if (writebuf != NULL && client_dcb != NULL)
        {
                /** Write reply to client DCB */
-                client_dcb->func.write(client_dcb, writebuf);
+		SESSION_ROUTE_REPLY(backend_dcb->session, writebuf);
                bref_clear_state(bref, BREF_WAITING_RESULT);
        }
        /** Unlock router session */