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

Add support for KILL [HARD|SOFT]

Browse Source 
The keywords HARD and SOFT are now ignored.
This commit is contained in:
Markus Mäkelä
2017-09-27 20:35:34 +03:00
parent 39c19e1bb9
commit 8fd8c30cd0
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/protocol/MySQL/MySQLClient/mysql_client.cc
View File

@ -1777,6 +1777,8 @@ static bool parse_kill_query(char *query, uint64_t *thread_id_out, kill_type_t *
{ {
const char WORD_CONNECTION[] = "CONNECTION"; const char WORD_CONNECTION[] = "CONNECTION";
const char WORD_QUERY[] = "QUERY"; const char WORD_QUERY[] = "QUERY";
const char WORD_HARD[] = "HARD";
const char WORD_SOFT[] = "SOFT";
const char DELIM[] = " \n\t"; const char DELIM[] = " \n\t";
kill_type_t kill_type = KT_CONNECTION; kill_type_t kill_type = KT_CONNECTION;
@ -1822,9 +1824,19 @@ static bool parse_kill_query(char *query, uint64_t *thread_id_out, kill_type_t *
{ {
get_next = true; get_next = true;
} }
/* Move to next state regardless of comparison result. The current
* part is optional and the process id may already be in the token. */ if (strncasecmp(token, WORD_HARD, sizeof(WORD_HARD) - 1) == 0 ||
state = ID; strncasecmp(token, WORD_SOFT, sizeof(WORD_SOFT) - 1) == 0)
{
/* This is an optional token and needs to be ignored */
get_next = true;
}
else
{
/* Move to next state regardless of comparison result. The current
* part is optional and the process id may already be in the token. */
state = ID;
}
break; break;
case ID: case ID: