diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-03 16:20:59 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-03 16:20:59 +0200 |
| commit | fe449affcf99fcf63f620994b544eb96d2504cda (patch) | |
| tree | 7a3fad4e3770043e2c88379f2da1f62f6ac61589 /sql/sql_lex.cc | |
| parent | 900d7bf3604e7ba265f06d96f76a049dc3c4c9af (diff) | |
| parent | 7865c8c9a2fba7444c29af3fcece32f7f83f71be (diff) | |
| download | mariadb-git-fe449affcf99fcf63f620994b544eb96d2504cda.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 7576b644810..d270c39931e 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -9624,7 +9624,8 @@ Item *LEX::create_item_qualified_asterisk(THD *thd, null_clex_str, *name, star_clex_str))) return NULL; - current_select->with_wild++; + current_select->parsing_place == IN_RETURNING ? + thd->lex->returning()->with_wild++ : current_select->with_wild++; return item; } @@ -9639,7 +9640,8 @@ Item *LEX::create_item_qualified_asterisk(THD *thd, if (!(item= new (thd->mem_root) Item_field(thd, current_context(), schema, *b, star_clex_str))) return NULL; - current_select->with_wild++; + current_select->parsing_place == IN_RETURNING ? + thd->lex->returning()->with_wild++ : current_select->with_wild++; return item; } |