diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-04 16:12:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-04 16:12:00 +0300 |
| commit | b50685af82508ca1cc83e1743dff527770e6e64b (patch) | |
| tree | abbbc2a2ca9f4f80b4cb0da2d775e037575204ab /sql/sql_union.cc | |
| parent | cac41001864ca503a7812b7f2a3b312435fb4ec4 (diff) | |
| parent | 8dc70c862b8ec115fd9a3c2b37c746ffc4f0d3cc (diff) | |
| download | mariadb-git-b50685af82508ca1cc83e1743dff527770e6e64b.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index a1963c33a42..266f221ca78 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1008,7 +1008,7 @@ bool st_select_lex_unit::prepare(TABLE_LIST *derived_arg, { if (with_element) { - if (derived_arg->with->rename_columns_of_derived_unit(thd, this)) + if (with_element->rename_columns_of_derived_unit(thd, this)) goto err; if (check_duplicate_names(thd, sl->item_list, 0)) goto err; |