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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2021-06-07 08:34:26 +03:00
parent ab71e93d49 946f2e57fa
commit 2d9ebbdbc4
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -1234,7 +1234,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"); MXS_INFO("COM_QUIT received while COM_CHANGE_USER is in progress, closing pooled connection");
gwbuf_free(queue); gwbuf_free(queue);
poll_fake_hangup_event(dcb); poll_fake_hangup_event(dcb);
rc = 0;
} }
else else
{ {
@ -1246,9 +1245,8 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue)
*/ */
MXS_INFO("COM_CHANGE_USER in progress, appending query to queue"); MXS_INFO("COM_CHANGE_USER in progress, appending query to queue");
backend_protocol->stored_query = gwbuf_append(backend_protocol->stored_query, queue); backend_protocol->stored_query = gwbuf_append(backend_protocol->stored_query, queue);
rc = 1;
} }
return rc; return 1;
} }
/** /**