From 946f2e57fae96ce1ebf48b05dead2ba3560dd98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 4 Jun 2021 14:05:48 +0300 Subject: [PATCH] MXS-3582: Backport fix to 2.3 and 2.4 2.3 and 2.4 seem to also be affected by it. --- server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc index 09db50a03..c3ee9a5c7 100644 --- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc +++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc @@ -1223,7 +1223,6 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue) MXS_INFO("COM_QUIT received while COM_CHANGE_USER is in progress, closing pooled connection"); gwbuf_free(queue); poll_fake_hangup_event(dcb); - rc = 0; } else { @@ -1235,9 +1234,8 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue) */ MXS_INFO("COM_CHANGE_USER in progress, appending query to queue"); backend_protocol->stored_query = gwbuf_append(backend_protocol->stored_query, queue); - rc = 1; } - return rc; + return 1; } /**