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

Fix to bug #678, http://bugs.skysql.com/show_bug.cgi?id=678

Browse Source 
tee.c:routeQuery cloned partial MySQL packets to be routed to child router. Problems were due to the use of gwbuf_clone and modutil_MySQL_query which clone/examine only the first buffer from the buffer list which composes GWBUF.
modutil.c: Added function modutil_MySQL_query_len which calculates MySQL packet length and the missing bytecount
This commit is contained in:
VilhoRaatikka
2015-01-02 18:32:57 +02:00
parent 48f443782e
commit 6228be4284
8 changed files with 88 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/modules/filter/tee.c
View File

@ -737,12 +737,12 @@ char *ptr;
int length, rval, residual = 0;
GWBUF *clone = NULL;
if (my_session->branch_session && my_session->branch_session->state == SESSION_STATE_ROUTER_READY)
if (my_session->branch_session &&
my_session->branch_session->state == SESSION_STATE_ROUTER_READY)
{
if (my_session->residual)
{
clone = gwbuf_clone(queue);
clone = gwbuf_clone_all(queue);
if (my_session->residual < GWBUF_LENGTH(clone))
{
@ -764,22 +764,22 @@ GWBUF *clone = NULL;
{
char *dummy;
modutil_MySQL_Query(queue, &dummy, &length, &residual);
clone = gwbuf_clone(queue);
length = modutil_MySQL_query_len(queue, &residual);
clone = gwbuf_clone_all(queue);
my_session->residual = residual;
}
free(ptr);
}
else if (packet_is_required(queue))
{
clone = gwbuf_clone(queue);
clone = gwbuf_clone_all(queue);
}
}
}
/* Pass the query downstream */
rval = my_session->down.routeQuery(my_session->down.instance,
my_session->down.session,
queue);
rval = my_session->down.routeQuery(
my_session->down.instance,
my_session->down.session,
queue);
if (clone)
{
my_session->n_duped++;