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

Fix EOF packet calculation for large rows

Browse Source 
The EOF packet calculation function in modutil.cc didn't handle the case
where the payload exceeded maximum packet size and could mistake binary
data for a ERR packet.

The state of a multi-packet payload is now exposed by the
modutil_count_signal_packets function. This allows proper handling of
large multi-packet payloads.

Added minor improvements to mxs1110_16mb to handle testing of this change.
This commit is contained in:
Markus Mäkelä
2017-08-25 14:23:14 +03:00
parent 5832352a08
commit 13f7015e7b
7 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -645,7 +645,7 @@ static inline bool complete_ps_response(GWBUF *buffer)
}
bool more;
int n_eof = modutil_count_signal_packets(buffer, 0, &more);
int n_eof = modutil_count_signal_packets(buffer, 0, &more, NULL);
MXS_DEBUG("Expecting %u EOF, have %u", n_eof, expected_eof);
@ -740,7 +740,7 @@ gw_read_and_write(DCB *dcb)
mxs_mysql_is_result_set(read_buffer))
{
bool more = false;
if (modutil_count_signal_packets(read_buffer, 0, &more) != 2)
if (modutil_count_signal_packets(read_buffer, 0, &more, NULL) != 2)
{
dcb->dcb_readqueue = gwbuf_append(read_buffer, dcb->dcb_readqueue);
return 0;