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

Always collect contiguous results for COM_CHANGE_USER

Browse Source 
The response to the COM_CHANGE_USER should always be turned into a
contiguous buffer of complete packets. This guarantees that the code that
processes it functions properly.
This commit is contained in:
Markus Mäkelä
2017-08-29 22:16:23 +03:00
parent 866a15dafa
commit c5581faae7
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
View File

@ -676,8 +676,9 @@ gw_read_and_write(DCB *dcb)
/** Ask what type of output the router/filter chain expects */ /** Ask what type of output the router/filter chain expects */
uint64_t capabilities = service_get_capabilities(session->service); uint64_t capabilities = service_get_capabilities(session->service);
MySQLProtocol *proto = (MySQLProtocol *)dcb->protocol;
if (rcap_type_required(capabilities, RCAP_TYPE_STMT_OUTPUT)) if (rcap_type_required(capabilities, RCAP_TYPE_STMT_OUTPUT) || proto->ignore_reply)
{ {
GWBUF *tmp = modutil_get_complete_packets(&read_buffer); GWBUF *tmp = modutil_get_complete_packets(&read_buffer);
/* Put any residue into the read queue */ /* Put any residue into the read queue */
@ -692,7 +693,7 @@ gw_read_and_write(DCB *dcb)
read_buffer = tmp; read_buffer = tmp;
if (rcap_type_required(capabilities, RCAP_TYPE_CONTIGUOUS_OUTPUT)) if (rcap_type_required(capabilities, RCAP_TYPE_CONTIGUOUS_OUTPUT) || proto->ignore_reply)
{ {
if ((tmp = gwbuf_make_contiguous(read_buffer))) if ((tmp = gwbuf_make_contiguous(read_buffer)))
{ {
@ -706,8 +707,6 @@ gw_read_and_write(DCB *dcb)
return 0; return 0;
} }
MySQLProtocol *proto = (MySQLProtocol*)dcb->protocol;
if (rcap_type_required(capabilities, RCAP_TYPE_RESULTSET_OUTPUT) && if (rcap_type_required(capabilities, RCAP_TYPE_RESULTSET_OUTPUT) &&
expecting_resultset(proto) && mxs_mysql_is_result_set(read_buffer)) expecting_resultset(proto) && mxs_mysql_is_result_set(read_buffer))
{ {
@ -721,11 +720,8 @@ gw_read_and_write(DCB *dcb)
} }
} }
MySQLProtocol *proto = (MySQLProtocol *)dcb->protocol;
if (proto->ignore_reply) if (proto->ignore_reply)
{ {
/** The reply to a COM_CHANGE_USER is in packet */ /** The reply to a COM_CHANGE_USER is in packet */
GWBUF *query = proto->stored_query; GWBUF *query = proto->stored_query;
proto->stored_query = NULL; proto->stored_query = NULL;