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-14 14:30:50 +02:00
parent ec1a4de480 d7c1d76065
commit 9f5d2244ea
31 changed files with 1881 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.c
View File

@ -371,7 +371,6 @@ mxs_auth_state_t handle_server_response(DCB *dcb, GWBUF *buffer)
}
}
gwbuf_free(buffer);
return rval;
}
@ -518,7 +517,6 @@ gw_read_backend_event(DCB *dcb)
}
proto->protocol_auth_state = state;
gwbuf_free(readbuf);
}
else if (proto->protocol_auth_state == MXS_AUTH_STATE_RESPONSE_SENT)
{
@ -548,6 +546,8 @@ gw_read_backend_event(DCB *dcb)
/** Authentication failed */
gw_reply_on_error(dcb, proto->protocol_auth_state);
}
gwbuf_free(readbuf);
}
else if (proto->protocol_auth_state == MXS_AUTH_STATE_CONNECTED &&
dcb->ssl_state == SSL_ESTABLISHED)
@ -752,6 +752,7 @@ gw_read_and_write(DCB *dcb)
if (rcap_type_required(capabilities, RCAP_TYPE_PACKET_OUTPUT) ||
rcap_type_required(capabilities, RCAP_TYPE_CONTIGUOUS_OUTPUT) ||
proto->collect_result ||
proto->ignore_replies != 0)
{
GWBUF *tmp = modutil_get_complete_packets(&read_buffer);