diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-04-06 14:33:27 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-04-06 14:33:27 +1000 |
| commit | 7ae46ced37d3c19fb3e488e168f023e5c22a10c5 (patch) | |
| tree | 032ccf9d215721a6e5d03fcd3ebe404fc9d18a65 /sql/sql_yacc.yy | |
| parent | ef930dcad58ae6c3f334a32bd63e26c65fd66fa6 (diff) | |
| parent | 7b06bc9a9447f1ec63930f27a4209b312d24c519 (diff) | |
| download | mariadb-git-7ae46ced37d3c19fb3e488e168f023e5c22a10c5.tar.gz | |
Merge branch 10.8 into 10.9
Closes #2084
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 d1c2a01fc39..a538607c888 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3560,7 +3560,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)) @@ -10981,7 +10981,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)) @@ -10995,7 +10995,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)) @@ -12641,7 +12641,7 @@ select_outvar: if (!$2.length) { thd->parse_error(); - YYABORT; + MYSQL_YYABORT; } $$ = Lex->result ? new (thd->mem_root) my_var_user(&$2) : NULL; @@ -14632,7 +14632,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); @@ -16453,7 +16453,7 @@ option_value_no_option_type: if (!$2.length) { thd->parse_error(); - YYABORT; + MYSQL_YYABORT; } if (sp_create_assignment_lex(thd, $1.str)) |