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

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 64fe629252
commit 1c57d3a4ce

View File

@ -88,7 +88,6 @@ static unsigned char required_packets[] =
{
MYSQL_COM_QUIT,
MYSQL_COM_INITDB,
MYSQL_COM_FIELD_LIST,
MYSQL_COM_CHANGE_USER,
MYSQL_COM_STMT_PREPARE,
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 */
my_session->waiting[CHILD] = false;
my_session->multipacket[CHILD] = false;
my_session->eof[CHILD] = 2;
my_session->n_rejected++;
}