diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-06 22:45:19 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-06 22:45:19 +0200 |
| commit | 31081593aabb116b6d8f86b6c7e76126edb392b4 (patch) | |
| tree | 767a069f255359b5ea37e7c491dfeacf6e519fad /sql/lex.h | |
| parent | b0026e33af8fc3b25a42099c096a84591fd550e2 (diff) | |
| parent | 3a4242fd57b3a2235d2478ed080941b67a82ad1b (diff) | |
| download | mariadb-git-31081593aabb116b6d8f86b6c7e76126edb392b4.tar.gz | |
Merge branch '11.0' into 10.1
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/lex.h b/sql/lex.h index 6a1cb6653e9..87c87d03fb3 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -633,7 +633,7 @@ static SYMBOL symbols[] = { { "UPGRADE", SYM(UPGRADE_SYM)}, { "USAGE", SYM(USAGE)}, { "USE", SYM(USE_SYM)}, - { "USER", SYM(USER)}, + { "USER", SYM(USER_SYM)}, { "USER_RESOURCES", SYM(RESOURCES)}, { "USE_FRM", SYM(USE_FRM)}, { "USING", SYM(USING)}, @@ -690,7 +690,7 @@ static SYMBOL sql_functions[] = { { "MIN", SYM(MIN_SYM)}, { "NOW", SYM(NOW_SYM)}, { "POSITION", SYM(POSITION_SYM)}, - { "SESSION_USER", SYM(USER)}, + { "SESSION_USER", SYM(USER_SYM)}, { "STD", SYM(STD_SYM)}, { "STDDEV", SYM(STD_SYM)}, { "STDDEV_POP", SYM(STD_SYM)}, @@ -700,7 +700,7 @@ static SYMBOL sql_functions[] = { { "SUBSTRING", SYM(SUBSTRING)}, { "SUM", SYM(SUM_SYM)}, { "SYSDATE", SYM(SYSDATE)}, - { "SYSTEM_USER", SYM(USER)}, + { "SYSTEM_USER", SYM(USER_SYM)}, { "TRIM", SYM(TRIM)}, { "VARIANCE", SYM(VARIANCE_SYM)}, { "VAR_POP", SYM(VARIANCE_SYM)}, |