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

Fix to multi-statement processing

Browse Source 
Renamed is_mysql_comment_start to is_mysql_statement_end because it checks
whether a statement truly ends instead of just checking comment block starts.

The calculations for buffer length in readwritesplit now use the payload size
instead of the buffer size.
This commit is contained in:
Markus Makela
2016-03-03 10:44:11 +02:00
parent 8b6595aa68
commit 76f06572ed
3 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -5362,7 +5362,8 @@ static void check_for_multi_stmt(ROUTER_CLIENT_SES* rses, GWBUF *buf,
packet_type == MYSQL_COM_QUERY && rses->forced_node != rses->rses_master_ref)
{
char *ptr, *data = GWBUF_DATA(buf) + 5;
int buflen = GWBUF_LENGTH(buf) - 5;
/** Payload size without command byte */
int buflen = gw_mysql_get_byte3((uint8_t*)GWBUF_DATA(buf)) - 1;
if ((ptr = strnchr_esc_mysql(data, ';', buflen)))
{
@ -5374,7 +5375,7 @@ static void check_for_multi_stmt(ROUTER_CLIENT_SES* rses, GWBUF *buf,
if (ptr)
{
if (ptr < data + buflen && !is_mysql_comment_start(ptr, ptr - data))
if (ptr < data + buflen && !is_mysql_statement_end(ptr, buflen - (ptr - data)))
{
rses->forced_node = rses->rses_master_ref;
MXS_INFO("Multi-statement query, routing all future queries to master.");