diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-04 13:22:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-04 13:22:26 +0200 |
| commit | 88a480cecb65dccfa4beb154d5e8bba6dffe9d94 (patch) | |
| tree | 299057e5dd0b601896b1ae368a9bdbac19aea2f6 /sql/sql_union.cc | |
| parent | 0070830cb8ebb999347fbff9c98b9534d4eeee8c (diff) | |
| parent | b6f203984bc519a31ac695cbcb6de7f1f638d321 (diff) | |
| download | mariadb-git-88a480cecb65dccfa4beb154d5e8bba6dffe9d94.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 1910ad0f83e..ca8a5e7a8b3 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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; } |