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

MXS-1275: Accept LOCAL as a synonum for SESSION

Browse Source
This commit is contained in:
Johan Wikman
2017-05-31 13:33:39 +03:00
parent 2483f95be2
commit 21c1845798
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/protocol/MySQL/MySQLClient/setsqlmodeparser.hh
View File

@ -588,6 +588,11 @@ private:
token = expect_token(MXS_CP_EXPECT_TOKEN("GLOBAL"), TK_GLOBAL); token = expect_token(MXS_CP_EXPECT_TOKEN("GLOBAL"), TK_GLOBAL);
break; break;
case 'l':
case 'L':
token = expect_token(MXS_CP_EXPECT_TOKEN("LOCAL"), TK_SESSION);
break;
case 'o': case 'o':
case 'O': case 'O':
token = expect_token(MXS_CP_EXPECT_TOKEN("ORACLE"), TK_ORACLE); token = expect_token(MXS_CP_EXPECT_TOKEN("ORACLE"), TK_ORACLE);

15
server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc
View File

@ -120,6 +120,21 @@ struct TEST_CASE
P::IS_SET_SQL_MODE, P::IS_SET_SQL_MODE,
P::ORACLE P::ORACLE
}, },
{
"SET GLOBAL SQL_MODE=ORACLE",
P::IS_SET_SQL_MODE,
P::ORACLE
},
{
"SET SESSION SQL_MODE=ORACLE",
P::IS_SET_SQL_MODE,
P::ORACLE
},
{
"SET LOCAL SQL_MODE=ORACLE",
P::IS_SET_SQL_MODE,
P::ORACLE
},
}; };
const int N_TEST_CASES = sizeof(test_cases)/sizeof(test_cases[0]); const int N_TEST_CASES = sizeof(test_cases)/sizeof(test_cases[0]);