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

…yntax Fixing PERIOD to PERIOD_SYM in the %left command.
MariaDB · May 22, 2018 · fe3bf13 · fe3bf13
1 parent b9cf26f
commit fe3bf13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
 
 
 /*