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/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@ -689,7 +689,7 @@ clientReply(

 	ss_dassert(client != NULL);

-	client->func.write(client, queue);
+	SESSION_ROUTE_REPLY(backend_dcb->session, queue);
 }

 /**