diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-02-17 14:30:25 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-02-17 14:30:25 -0800 |
| commit | f340aaeb52916d028a41ed771dfbbdd9dc4c3f88 (patch) | |
| tree | b21ddfef1213a345019fa1835844ae44be420bc5 /sql/sql_derived.cc | |
| parent | 22f52f1f09b62534eea139a678c954507bb3e89e (diff) | |
| download | mariadb-git-bb-10.2-mdev8789.tar.gz | |
Addressed the issues raised in the review for the main patchbb-10.2-mdev8789
of mdev-8789.
Fixed a bug in TABLE_LIST::print.
Fixed another bug for the case when the definition of a
WITH table contained column list while the join in the main
query used two instances of this table.
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 978c6a1fdf6..1ef83b3bf1f 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -672,7 +672,7 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived) if ((res= unit->prepare(thd, derived->derived_result, 0))) goto exit; if (derived->with && - (res= derived->with->process_column_list(thd))) + (res= derived->with->rename_columns_of_derived_unit(thd, unit))) goto exit; lex->context_analysis_only&= ~CONTEXT_ANALYSIS_ONLY_DERIVED; if ((res= check_duplicate_names(thd, unit->types, 0))) |