diff --git a/sql/lex.h b/sql/lex.h index 8a3fe552b9510f43d19589c26af8262226b48ef3..41a81c737f72fa1f0e53c49b73278d3981567076 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -273,7 +273,6 @@ static SYMBOL symbols[] = { { "HAVING", SYM(HAVING)}, { "HELP", SYM(HELP_SYM)}, { "HIGH_PRIORITY", SYM(HIGH_PRIORITY)}, - { "INVISIBLE", SYM(INVISIBLE_SYM)}, { "HISTORY", SYM(HISTORY_SYM)}, { "HOST", SYM(HOST_SYM)}, { "HOSTS", SYM(HOSTS_SYM)}, @@ -310,6 +309,7 @@ static SYMBOL symbols[] = { { "INT8", SYM(BIGINT)}, { "INTEGER", SYM(INT_SYM)}, { "INTERVAL", SYM(INTERVAL_SYM)}, + { "INVISIBLE", SYM(INVISIBLE_SYM)}, { "INTO", SYM(INTO)}, { "IO", SYM(IO_SYM)}, { "IO_THREAD", SYM(RELAY_THREAD)}, diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 63514d7257d492139a65f19ab89dcbf6adb30547..4967065d7ee22ef1dc87579ec971fdc1e8c4504c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1156,7 +1156,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token HEX_NUM %token HEX_STRING %token HIGH_PRIORITY -%token INVISIBLE_SYM %token HISTORY_SYM /* MYSQL */ %token HOST_SYM %token HOSTS_SYM @@ -1198,6 +1197,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token ISOPEN_SYM /* Oracle-N */ %token ISSUER_SYM %token ITERATE_SYM +%token INVISIBLE_SYM %token JOIN_SYM /* SQL-2003-R */ %token JSON_SYM %token KEYS @@ -15517,7 +15517,6 @@ keyword_sp_not_data_type: | GOTO_SYM {} | HASH_SYM {} | HARD_SYM {} - | INVISIBLE_SYM {} | HISTORY_SYM {} | HOSTS_SYM {} | HOUR_SYM {} @@ -15536,6 +15535,7 @@ keyword_sp_not_data_type: | ISOPEN_SYM {} | ISSUER_SYM {} | INSERT_METHOD {} + | INVISIBLE_SYM {} | KEY_BLOCK_SIZE {} | LAST_VALUE {} | LAST_SYM {} diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index 82295e5453d0cf56aa7bc908968b8fa5a3aec35b..610021420143e12560cabfcd2ea5c33bb38ddb37 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -284,6 +284,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); Comments for TOKENS. For each token, please include in the same line a comment that contains the following tags: + SQL-2011-R : Reserved keyword as per SQL-2011 SQL-2011-N : Non Reserved keyword as per SQL-2011 SQL-2003-R : Reserved keyword as per SQL-2003 SQL-2003-N : Non Reserved keyword as per SQL-2003 @@ -538,7 +539,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token HEX_NUM %token HEX_STRING %token HIGH_PRIORITY -%token INVISIBLE_SYM +%token HISTORY_SYM /* MYSQL */ %token HOST_SYM %token HOSTS_SYM %token HOUR_MICROSECOND_SYM @@ -579,6 +580,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token ISOPEN_SYM /* Oracle-N */ %token ISSUER_SYM %token ITERATE_SYM +%token INVISIBLE_SYM %token JOIN_SYM /* SQL-2003-R */ %token JSON_SYM %token KEYS @@ -743,7 +745,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token PERCENT_RANK_SYM %token PERCENTILE_CONT_SYM %token PERCENTILE_DISC_SYM -%token PERIOD_SYM /* 32N2439 */ +%token PERIOD_SYM /* SQL-2011-R */ %token PERSISTENT_SYM %token PHASE_SYM %token PLUGINS_SYM @@ -910,8 +912,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token SWAPS_SYM %token SWITCHES_SYM %token SYSDATE -%token SYSTEM /* 32N2439 */ -%token SYSTEM_TIME_SYM /* 32N2439 */ +%token SYSTEM /* SQL-2011-R */ +%token SYSTEM_TIME_SYM /* SQL-2011-R */ %token TABLES %token TABLESPACE %token TABLE_REF_PRIORITY @@ -982,7 +984,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token VARIANCE_SYM %token VARYING /* SQL-2003-R */ %token VAR_SAMP_SYM -%token VERSIONING_SYM /* 32N2439 */ +%token VERSIONING_SYM /* SQL-2011-R */ %token VIA_SYM %token VIEW_SYM /* SQL-2003-N */ %token VIRTUAL_SYM