Commit fdf32f57 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: param_marker rule in the parser

preserve the Item_param type of the param_marker in the parser,
don't upcast cast it to Item
parent 1e0a11a3
...@@ -904,6 +904,7 @@ static bool sp_create_assignment_instr(THD *thd, bool no_lookahead) ...@@ -904,6 +904,7 @@ static bool sp_create_assignment_instr(THD *thd, bool no_lookahead)
Table_ident *table; Table_ident *table;
char *simple_string; char *simple_string;
Item *item; Item *item;
Item_param *item_param;
Item_num *item_num; Item_num *item_num;
List<Item> *item_list; List<Item> *item_list;
List<String> *string_list; List<String> *string_list;
...@@ -1720,7 +1721,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); ...@@ -1720,7 +1721,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
predicate bit_expr predicate bit_expr
table_wild simple_expr udf_expr table_wild simple_expr udf_expr
expr_or_default set_expr_or_default expr_or_default set_expr_or_default
param_marker geometry_function geometry_function
signed_literal now_or_signed_literal opt_escape signed_literal now_or_signed_literal opt_escape
sp_opt_default sp_opt_default
simple_ident_nospvar simple_ident_q simple_ident_nospvar simple_ident_q
...@@ -1734,6 +1735,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); ...@@ -1734,6 +1735,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
simple_target_specification simple_target_specification
condition_number condition_number
%type <item_param> param_marker
%type <item_num> %type <item_num>
NUM_literal NUM_literal
...@@ -9140,7 +9143,7 @@ simple_expr: ...@@ -9140,7 +9143,7 @@ simple_expr:
MYSQL_YYABORT; MYSQL_YYABORT;
} }
| literal | literal
| param_marker | param_marker { $$= $1; }
| variable | variable
| sum_expr | sum_expr
| simple_expr OR_OR_SYM simple_expr | simple_expr OR_OR_SYM simple_expr
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment