1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bring changes to oracle parser

Browse Source
This commit is contained in:
Oleksandr Byelkin 2020-12-24 15:47:01 +01:00
parent 25561435e0
commit f87737db04
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_yacc_ora.yy
View File

@ -288,7 +288,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
/* /*
We should not introduce any further shift/reduce conflicts. We should not introduce any further shift/reduce conflicts.
*/ */
%expect 70 %expect 63
/* /*
Comments for TOKENS. Comments for TOKENS.
@ -1332,7 +1332,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%type <item> %type <item>
literal insert_ident order_ident temporal_literal literal insert_ident order_ident temporal_literal
simple_ident expr sum_expr in_sum_expr simple_ident expr sum_expr in_sum_expr
variable variable_aux bool_pri variable variable_aux
predicate bit_expr parenthesized_expr predicate bit_expr parenthesized_expr
table_wild simple_expr column_default_non_parenthesized_expr udf_expr table_wild simple_expr column_default_non_parenthesized_expr udf_expr
primary_expr string_factor_expr mysql_concatenation_expr primary_expr string_factor_expr mysql_concatenation_expr
@ -9781,23 +9781,19 @@ expr:
if (unlikely($$ == NULL)) if (unlikely($$ == NULL))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
| bool_pri | expr EQUAL_SYM predicate %prec EQUAL_SYM
;
bool_pri:
bool_pri EQUAL_SYM predicate %prec EQUAL_SYM
{ {
$$= new (thd->mem_root) Item_func_equal(thd, $1, $3); $$= new (thd->mem_root) Item_func_equal(thd, $1, $3);
if (unlikely($$ == NULL)) if (unlikely($$ == NULL))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
| bool_pri comp_op predicate %prec '=' | expr comp_op predicate %prec '='
{ {
$$= (*$2)(0)->create(thd, $1, $3); $$= (*$2)(0)->create(thd, $1, $3);
if (unlikely($$ == NULL)) if (unlikely($$ == NULL))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
| bool_pri comp_op all_or_any '(' subselect ')' %prec '=' | expr comp_op all_or_any '(' subselect ')' %prec '='
{ {
$$= all_any_subquery_creator(thd, $1, $2, $3, $5); $$= all_any_subquery_creator(thd, $1, $2, $3, $5);
if (unlikely($$ == NULL)) if (unlikely($$ == NULL))