Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fe3bf136
Commit
fe3bf136
authored
May 22, 2018
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A cleanup for MDEV-15818 Fix shift-reduce conflicts in the new 10.3 syntax
Fixing PERIOD to PERIOD_SYM in the %left command.
parent
b9cf26f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
sql/sql_yacc.yy
sql/sql_yacc.yy
+3
-3
sql/sql_yacc_ora.yy
sql/sql_yacc_ora.yy
+3
-3
No files found.
sql/sql_yacc.yy
View file @
fe3bf136
...
...
@@ -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
/*
...
...
sql/sql_yacc_ora.yy
View file @
fe3bf136
...
...
@@ -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
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment