diff options
| author | Igor Babaev <igor@askmonty.org> | 2020-10-13 12:25:09 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2020-10-13 12:25:09 -0700 |
| commit | aa0b5d6965c75c8b1c3659f064dc62a7a271f2d0 (patch) | |
| tree | bf0773e39489a5f89f10a4249e29da4c9b8d2329 /sql/table.cc | |
| parent | 393ad0215fa4f1833650c801133ae1806cc63ef4 (diff) | |
| download | mariadb-git-10.5-mdev-18511.tar.gz | |
MDEV-18511: CTE support for UPDATE and DELETE statements10.5-mdev-18511
MDEV-23552: Merge mergeable derived tables used at the top level of UPDATE
statements
A complement for the previous patch that allows to run successfully all
tests from
derived_update.test, cte_update.test, view_update.test,
derived_update_multi.test, cte_update_multi.test, view_update_multi.test
and from
view.test, derived.test, derived_view.test,
cte_nonrecursive, cte recursive
with --ps-protocol.
Some tests from view.test and derived_view were changed though. Later this
will be fixed.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index 8bc5fe7f8f2..a3ad2fcc915 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -6820,10 +6820,7 @@ void Field_iterator_table_ref::set_field_iterator() table_ref->alias.str)); } /* This is a merge view, so use field_translation. */ - else if (table_ref->field_translation && - !(table_ref->is_view_or_derived() && - table_ref->select_lex->master_unit()-> - thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_PREPARE)) + else if (table_ref->field_translation) { DBUG_ASSERT(table_ref->is_merged_derived()); field_it= &view_field_it; |