diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-04-06 14:23:20 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-04-06 14:23:20 +1000 |
| commit | 7b06bc9a9447f1ec63930f27a4209b312d24c519 (patch) | |
| tree | 75d95e1083d527a38754446ca1c933142c779d24 /sql/sql_yacc.yy | |
| parent | 5c69e936308b9b636d3e58aff624d2716f289fbd (diff) | |
| parent | b249abde57f1788a8085f45cc6252ee70ece3354 (diff) | |
| download | mariadb-git-7b06bc9a9447f1ec63930f27a4209b312d24c519.tar.gz | |
Merge branch 10.7 into 10.8
Closes #2083
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ce319ff880c..6600d2fec6f 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3558,7 +3558,7 @@ simple_target_specification: if (!$2.length) { thd->parse_error(); - YYABORT; + MYSQL_YYABORT; } $$= new (thd->mem_root) Item_func_get_user_var(thd, &$2); if (unlikely($$ == NULL)) @@ -10961,7 +10961,7 @@ variable_aux: if (!$1.length) { thd->parse_error(); - YYABORT; + MYSQL_YYABORT; } $$= item= new (thd->mem_root) Item_func_set_user_var(thd, &$1, $3); if (unlikely($$ == NULL)) @@ -10975,7 +10975,7 @@ variable_aux: if (!$1.length) { thd->parse_error(); - YYABORT; + MYSQL_YYABORT; } $$= new (thd->mem_root) Item_func_get_user_var(thd, &$1); if (unlikely($$ == NULL)) @@ -12613,7 +12613,7 @@ select_outvar: if (!$2.length) { thd->parse_error(); - YYABORT; + MYSQL_YYABORT; } $$ = Lex->result ? new (thd->mem_root) my_var_user(&$2) : NULL; @@ -14604,7 +14604,7 @@ field_or_var: if (!$2.length) { thd->parse_error(); - YYABORT; + MYSQL_YYABORT; } $$= new (thd->mem_root) Item_user_var_as_out_param(thd, &$2); @@ -16425,7 +16425,7 @@ option_value_no_option_type: if (!$2.length) { thd->parse_error(); - YYABORT; + MYSQL_YYABORT; } if (sp_create_assignment_lex(thd, $1.str)) |