diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2013-09-13 20:14:56 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-09-13 20:14:56 +0400 |
commit | 1a2a9d74fe1256554eceb09bbc6752a6376df87d (patch) | |
tree | 7e673528773b0ef3c001d878b8646105f95a5f5f /sql/lex.h | |
parent | 7a80c534ad0eb7d71e67999e27d1759d6a8fbf95 (diff) | |
download | mariadb-git-1a2a9d74fe1256554eceb09bbc6752a6376df87d.tar.gz |
MDEV-4911 - add KILL query id, and add query id information to processlist
It is now possible to kill query by query id. KILL syntax was extended to:
KILL [HARD | SOFT] [CONNECTION | QUERY [ID query_id]] [thread_id | USER user_name]
Added QUERY_ID column to INFORMATION_SCHEMA.PROCESSLIST.
Fixed tests affected by this change:
- added PROCESSLIST.QUERY_ID column
- ID is now keyword and is quoted in SHOW CREATE TABLE output
- PFS statement digest is calculated basing on token id
(not token text). Token id has shifted for keywords residing
after ID in keywords array.
Diffstat (limited to 'sql/lex.h')
-rw-r--r-- | sql/lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index a4bbf74e715..003f3175c61 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -262,6 +262,7 @@ static SYMBOL symbols[] = { { "HOUR_MICROSECOND", SYM(HOUR_MICROSECOND_SYM)}, { "HOUR_MINUTE", SYM(HOUR_MINUTE_SYM)}, { "HOUR_SECOND", SYM(HOUR_SECOND_SYM)}, + { "ID", SYM(ID_SYM)}, { "IDENTIFIED", SYM(IDENTIFIED_SYM)}, { "IF", SYM(IF)}, { "IGNORE", SYM(IGNORE_SYM)}, |