hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into MAX-99

Browse Source 
Conflicts:
	server/modules/routing/readwritesplit/readwritesplit.c
This commit is contained in:
VilhoRaatikka
2014-06-25 17:50:29 +03:00
parent dff18bf9bb 792ae454f4
commit 1d1da398d4
31 changed files with 1715 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/readconnroute.c
View File

@ -689,7 +689,7 @@ clientReply(
ss_dassert(client != NULL);
client->func.write(client, queue);
SESSION_ROUTE_REPLY(backend_dcb->session, queue);
}
/**

2
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -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 */