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

MXS-1196: Handle "exit" correctly

Browse Source 
"exit" is both a mysqltest and PL/SQL keyword.
This commit is contained in:
Johan Wikman
2017-05-23 15:52:22 +03:00
parent 09b0c44be5
commit 38863bd319
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
query_classifier/test/testreader.cc
View File

@ -158,11 +158,11 @@ skip_action_t get_action(const string& keyword, const string& delimiter)
std::transform(key.begin(), key.end(), key.begin(), ::tolower); std::transform(key.begin(), key.end(), key.begin(), ::tolower);
// "while" is both a mysqltest and PL/SQL keyword. We use the // "while" and "exit" are both mysqltest and PL/SQL keywords. We use
// heuristic that if the delimiter is something else but ";" // the heuristic that if the delimiter is something else but ";"
// we assume it used in a PL/SQL context. // we assume it used in a PL/SQL context.
if ((key != "while") || (delimiter == ";")) if ((delimiter == ";") || ((key != "while") && (key != "exit")))
{ {
KeywordActionMapping::iterator i = mtl_keywords.find(key); KeywordActionMapping::iterator i = mtl_keywords.find(key);