Merge branch '2.3' into 2.4

This commit is contained in:
Johan Wikman
2020-06-18 11:58:38 +03:00
4 changed files with 13 additions and 3 deletions

View File

@ -351,6 +351,7 @@ static Keyword aKeywordTable[] = {
{ "MASTER", "TK_MASTER", ALWAYS },
{ "MERGE", "TK_MERGE", ALWAYS },
{ "MOD", "TK_MOD", ALWAYS },
{ "MODE", "TK_MODE", ALWAYS },
{ "NAMES", "TK_NAMES", ALWAYS },
#endif
{ "NATURAL", "TK_JOIN_KW", ALWAYS },
@ -446,6 +447,7 @@ static Keyword aKeywordTable[] = {
#ifdef MAXSCALE
{ "SESSION", "TK_SESSION", ALWAYS },
{ "SEPARATOR", "TK_SEPARATOR", ALWAYS },
{ "SHARE", "TK_SHARE", ALWAYS },
{ "SHOW", "TK_SHOW", ALWAYS },
{ "SLAVE", "TK_SLAVE", ALWAYS },
{ "SPATIAL", "TK_SPATIAL", ALWAYS },