From 992d6fb3bc05e5bf3de4a171d71ba10cca76dd13 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 9 Dec 2015 15:50:31 +0200 Subject: [PATCH] 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. --- server/modules/filter/tee.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/filter/tee.c b/server/modules/filter/tee.c index 64ace6b77..3a9a99b92 100644 --- a/server/modules/filter/tee.c +++ b/server/modules/filter/tee.c @@ -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++; }