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

MXS-2538: Fix hang on unknown KILL

Browse Source 
Unknown KILL commands are now forwarded as-is to the routers.
This commit is contained in:
Markus Mäkelä
2019-05-31 12:21:44 +03:00
parent 220fea3546
commit e9c652555d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -1937,11 +1937,12 @@ spec_com_res_t handle_query_kill(DCB* dcb,
querybuf[copied_len] = '\0'; querybuf[copied_len] = '\0';
kill_type_t kt = KT_CONNECTION; kill_type_t kt = KT_CONNECTION;
uint64_t thread_id = 0; uint64_t thread_id = 0;
rval = RES_END;
std::string user; std::string user;
if (parse_kill_query(querybuf, &thread_id, &kt, &user)) if (parse_kill_query(querybuf, &thread_id, &kt, &user))
{ {
rval = RES_END;
if (thread_id > 0) if (thread_id > 0)
{ {
mxs_mysql_execute_kill(dcb->session, thread_id, kt); mxs_mysql_execute_kill(dcb->session, thread_id, kt);