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

A cleanup for MDEV-15818 Fix shift-reduce conflicts in the new 10.3 syntax

Browse source 
Fixing PERIOD to PERIOD_SYM in the %left command.
This commit is contained in:
Alexander Barkov 2018-05-22 08:34:10 +04:00
parent b9cf26f726
commit fe3bf136b6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_yacc.yy
View file

@ -890,10 +890,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%parse-param { THD *thd } %parse-param { THD *thd }
%lex-param { THD *thd } %lex-param { THD *thd }
/* /*
Currently there are 72 shift/reduce conflicts. Currently there are 68 shift/reduce conflicts.
We should not introduce new conflicts any more. We should not introduce new conflicts any more.
*/ */
%expect 72 %expect 68
/* /*
Comments for TOKENS. Comments for TOKENS.
@ -1731,7 +1731,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
and until NEXT_SYM / PREVIOUS_SYM. and until NEXT_SYM / PREVIOUS_SYM.
*/ */
%left PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE %left PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE
%left TRANSACTION_SYM TIMESTAMP PERIOD SYSTEM %left TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM
/* /*

6
sql/sql_yacc_ora.yy
View file

@ -282,10 +282,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%parse-param { THD *thd } %parse-param { THD *thd }
%lex-param { THD *thd } %lex-param { THD *thd }
/* /*
Currently there are 73 shift/reduce conflicts. Currently there are 69 shift/reduce conflicts.
We should not introduce new conflicts any more. We should not introduce new conflicts any more.
*/ */
%expect 73 %expect 69
/* /*
Comments for TOKENS. Comments for TOKENS.
@ -1123,7 +1123,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
and until NEXT_SYM / PREVIOUS_SYM. and until NEXT_SYM / PREVIOUS_SYM.
*/ */
%left PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE %left PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE
%left TRANSACTION_SYM TIMESTAMP PERIOD SYSTEM %left TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM
/* /*