mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tests

Browse source 
* test results
* HISTORY in ora parser
This commit is contained in:
Sergei Golubchik 2017-12-11 20:26:21 +01:00 committed by Eugene Kosov
parent 64749432ef
commit c968a7ebfd
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/lex.h
View file

@ -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)},

4
sql/sql_yacc.yy
View file

@ -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 {}

12
sql/sql_yacc_ora.yy
View file

@ -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