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

Handle COM_SET_OPTION in client protocol

Browse Source 
The client protocol capability bytes are now updated when a COM_SET_OPTION
is executed.
This commit is contained in:
Markus Mäkelä
2017-01-25 19:30:08 +02:00
parent 3378edc4d3
commit 4b7f282f14
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/modules/protocol/MySQL/MySQLClient/mysql_client.c
View File

@ -896,9 +896,6 @@ gw_read_normal_data(DCB *dcb, GWBUF *read_buffer, int nbytes_read)
* we need to make sure that a complete SQL packet is read before continuing */ * we need to make sure that a complete SQL packet is read before continuing */
if (rcap_type_required(capabilities, RCAP_TYPE_STMT_INPUT)) if (rcap_type_required(capabilities, RCAP_TYPE_STMT_INPUT))
{ {
uint8_t* data;
int packet_size;
if (nbytes_read < 3 || nbytes_read < if (nbytes_read < 3 || nbytes_read <
(MYSQL_GET_PAYLOAD_LEN((uint8_t *) GWBUF_DATA(read_buffer)) + 4)) (MYSQL_GET_PAYLOAD_LEN((uint8_t *) GWBUF_DATA(read_buffer)) + 4))
{ {
@ -909,6 +906,29 @@ gw_read_normal_data(DCB *dcb, GWBUF *read_buffer, int nbytes_read)
} }
gwbuf_set_type(read_buffer, GWBUF_TYPE_MYSQL); gwbuf_set_type(read_buffer, GWBUF_TYPE_MYSQL);
} }
/**
* Handle COM_SET_OPTION. This seems to be only used by some versions of PHP.
*
* The option is stored as a two byte integer with the values 0 for disabling
* multi-statements and 1 for enabling it.
*/
MySQLProtocol *proto = dcb->protocol;
uint8_t opt;
if (proto->current_command == MYSQL_COM_SET_OPTION &&
gwbuf_copy_data(read_buffer, MYSQL_HEADER_LEN + 2, 1, &opt))
{
if (opt)
{
proto->client_capabilities &= ~GW_MYSQL_CAPABILITIES_MULTI_STATEMENTS;
}
else
{
proto->client_capabilities |= GW_MYSQL_CAPABILITIES_MULTI_STATEMENTS;
}
}
return gw_read_finish_processing(dcb, read_buffer, capabilities); return gw_read_finish_processing(dcb, read_buffer, capabilities);
} }