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

Fix to MXS-501: Tee filter and USE ... no longer hangs

Browse Source 
Some of the data was not reset for the branch session when a query
was not duplicated which could lead to a hang. Also the COM_FIELD_LIST
duplicated to the branch session even though it doesn't change the
session state.
This commit is contained in:
Markus Makela
2015-12-09 15:50:31 +02:00
parent 5ebdd6f47d
commit 992d6fb3bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,6 @@ static unsigned char required_packets[] =
{ {
MYSQL_COM_QUIT, MYSQL_COM_QUIT,
MYSQL_COM_INITDB, MYSQL_COM_INITDB,
MYSQL_COM_FIELD_LIST,
MYSQL_COM_CHANGE_USER, MYSQL_COM_CHANGE_USER,
MYSQL_COM_STMT_PREPARE, MYSQL_COM_STMT_PREPARE,
MYSQL_COM_STMT_EXECUTE, MYSQL_COM_STMT_EXECUTE,
@ -1323,6 +1322,7 @@ int route_single_query(TEE_INSTANCE* my_instance, TEE_SESSION* my_session, GWBUF
{ {
/** We won't be expecting any response from the child branch */ /** We won't be expecting any response from the child branch */
my_session->waiting[CHILD] = false; my_session->waiting[CHILD] = false;
my_session->multipacket[CHILD] = false;
my_session->eof[CHILD] = 2; my_session->eof[CHILD] = 2;
my_session->n_rejected++; my_session->n_rejected++;
} }