diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 6 | ||||
| -rw-r--r-- | sql/sql_yacc_ora.yy | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 157b5636806..41c05e9df34 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -890,10 +890,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %parse-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. */ -%expect 72 +%expect 68 /* Comments for TOKENS. @@ -1731,7 +1731,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); and until NEXT_SYM / PREVIOUS_SYM. */ %left PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE -%left TRANSACTION_SYM TIMESTAMP PERIOD SYSTEM +%left TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM /* diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index 5701880ecb9..5c885a5a2cf 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -282,10 +282,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %parse-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. */ -%expect 73 +%expect 69 /* Comments for TOKENS. @@ -1123,7 +1123,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); and until NEXT_SYM / PREVIOUS_SYM. */ %left PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE -%left TRANSACTION_SYM TIMESTAMP PERIOD SYSTEM +%left TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM /* |