database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2018-12-04 13:22:26 +02:00
parent 0070830cb8 b6f203984b
commit 88a480cecb
9 changed files with 128 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_union.cc
View File

@ -1046,8 +1046,11 @@ bool st_select_lex_unit::prepare(TABLE_LIST *derived_arg,
0))
goto err;
if (!derived_arg->table)
derived_arg->table= derived_arg->derived_result->table=
with_element->rec_result->rec_tables.head();
{
derived_arg->table= with_element->rec_result->rec_tables.head();
if (derived_arg->derived_result)
derived_arg->derived_result->table= derived_arg->table;
}
with_element->mark_as_with_prepared_anchor();
is_rec_result_table_created= true;
}