From 710093ccb032fa9247e87e6174c91abc40bc567f Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 4 Sep 2018 09:49:00 +0200
Subject: [PATCH] compilation failure

---
 sql/lex.h       |  6 +++---
 sql/sql_yacc.yy | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sql/lex.h b/sql/lex.h
index 591f0def43e..868f19ed9c4 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -630,7 +630,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)},
   { "USER_STATISTICS",	SYM(USER_STATS_SYM)},
   { "USE_FRM",		SYM(USE_FRM)},
@@ -688,7 +688,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)},
@@ -698,7 +698,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)},
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 8d0a4506a0b..1ae964ac7f8 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1584,7 +1584,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  UPDATE_SYM                    /* SQL-2003-R */
 %token  UPGRADE_SYM
 %token  USAGE                         /* SQL-2003-N */
-%token  USER                          /* SQL-2003-R */
+%token  USER_SYM                      /* SQL-2003-R */
 %token  USER_STATS_SYM
 %token  USE_FRM
 %token  USE_SYM
@@ -2455,7 +2455,7 @@ create:
                MYSQL_YYABORT;
             }
           }
-        | CREATE USER clear_privileges grant_list
+        | CREATE USER_SYM clear_privileges grant_list
           {
             Lex->sql_command = SQLCOM_CREATE_USER;
           }
@@ -2496,7 +2496,7 @@ server_options_list:
         ;
 
 server_option:
-          USER TEXT_STRING_sys
+          USER_SYM TEXT_STRING_sys
           {
             Lex->server_options.username= $2.str;
           }
@@ -8151,7 +8151,7 @@ rename:
           }
           table_to_table_list
           {}
-        | RENAME USER clear_privileges rename_list
+        | RENAME USER_SYM clear_privileges rename_list
           {
             Lex->sql_command = SQLCOM_RENAME_USER;
           }
@@ -9470,7 +9470,7 @@ function_call_keyword:
             if ($$ == NULL)
               MYSQL_YYABORT;
           }
-        | USER '(' ')'
+        | USER_SYM '(' ')'
           {
             $$= new (thd->mem_root) Item_func_user();
             if ($$ == NULL)
@@ -11760,7 +11760,7 @@ drop:
             lex->check_exists= $3;
             lex->spname= $4;
           }
-        | DROP USER clear_privileges user_list
+        | DROP USER_SYM clear_privileges user_list
           {
             Lex->sql_command = SQLCOM_DROP_USER;
           }
@@ -13018,7 +13018,7 @@ kill_expr:
         {
           Lex->value_list.push_front($$);
          }
-        | USER user
+        | USER_SYM user
           {
             Lex->users_list.push_back($2);
             Lex->kill_type= KILL_TYPE_USER;
@@ -14366,7 +14366,7 @@ keyword_sp:
         | UNDOFILE_SYM             {}
         | UNKNOWN_SYM              {}
         | UNTIL_SYM                {}
-        | USER                     {}
+        | USER_SYM                 {}
         | USER_STATS_SYM           {}
         | USE_FRM                  {}
         | VARIABLES                {}
@@ -15257,7 +15257,7 @@ object_privilege:
         | SHOW VIEW_SYM           { Lex->grant |= SHOW_VIEW_ACL; }
         | CREATE ROUTINE_SYM      { Lex->grant |= CREATE_PROC_ACL; }
         | ALTER ROUTINE_SYM       { Lex->grant |= ALTER_PROC_ACL; }
-        | CREATE USER             { Lex->grant |= CREATE_USER_ACL; }
+        | CREATE USER_SYM         { Lex->grant |= CREATE_USER_ACL; }
         | EVENT_SYM               { Lex->grant |= EVENT_ACL;}
         | TRIGGER_SYM             { Lex->grant |= TRIGGER_ACL; }
         | CREATE TABLESPACE       { Lex->grant |= CREATE_TABLESPACE_ACL; }