Skip to content

Commit b7e9bf9

Browse files
author
Alexander Barkov
committed
MDEV-9169 BINLOG_SYM in keywords_sp causes shift/reduce conflicts
1 parent b7eaba4 commit b7e9bf9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sql/sql_yacc.yy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -994,10 +994,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
994994
%parse-param { THD *thd }
995995
%lex-param { THD *thd }
996996
/*
997-
Currently there are 142 shift/reduce conflicts.
997+
Currently there are 121 shift/reduce conflicts.
998998
We should not introduce new conflicts any more.
999999
*/
1000-
%expect 142
1000+
%expect 121
10011001

10021002
/*
10031003
Comments for TOKENS.
@@ -14220,6 +14220,7 @@ keyword:
1422014220
| ASCII_SYM {}
1422114221
| BACKUP_SYM {}
1422214222
| BEGIN_SYM {}
14223+
| BINLOG_SYM {}
1422314224
| BYTE_SYM {}
1422414225
| CACHE_SYM {}
1422514226
| CHARSET {}
@@ -14303,7 +14304,6 @@ keyword_sp:
1430314304
| AUTO_SYM {}
1430414305
| AVG_ROW_LENGTH {}
1430514306
| AVG_SYM {}
14306-
| BINLOG_SYM {}
1430714307
| BIT_SYM {}
1430814308
| BLOCK_SYM {}
1430914309
| BOOL_SYM {}

0 commit comments

Comments
 (0)