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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-03-06 17:02:03 +02:00
parent 8232c5d449 78abfd67e6
commit d6b8147119
13 changed files with 256 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/protocol/MySQL/mysql_common.cc
View File

@ -1376,7 +1376,7 @@ mxs_auth_state_t gw_send_backend_auth(DCB *dcb)
with_ssl, ssl_established);
ss_dassert(buffer);
if (with_ssl)
if (with_ssl && !ssl_established)
{
if (dcb_write(dcb, buffer) && dcb_connect_SSL(dcb) >= 0)
{

4
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -1253,10 +1253,12 @@ static void clientReply(MXS_ROUTER *instance,
rses->expected_responses--;
ss_dassert(rses->expected_responses >= 0);
ss_dassert(backend->get_reply_state() == REPLY_STATE_DONE);
MXS_INFO("Reply complete, last reply from %s", backend->name());
}
else
{
MXS_DEBUG("Reply not yet complete, waiting for %d replies", rses->expected_responses);
MXS_INFO("Reply not yet complete. Waiting for %d replies, got one from %s",
rses->expected_responses, backend->name());
}
/**