diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-03-08 16:12:17 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-03-08 16:12:17 +0100 |
commit | 67c3c629d71dec9475097bada754e6bf5e000560 (patch) | |
tree | f319d536f7f7e44356856d0d2f18dd653fc49835 /sql/sql_base.cc | |
parent | 0b1abc2f0f391d4e55029fa53f1e5da926f7be61 (diff) | |
download | mariadb-git-bb-10.2-MDEV-11363.tar.gz |
MDEV-11363: Assertion `!derived->first_sel ect()->first_inner_unit() || derived->first_select()->first_inner_unit()->first_select()-> exclude_from_table_unique_test' failed in TABLE_LIST::set_check_materialized()bb-10.2-MDEV-11363
Do not try to materialize derived table which already merged (irreversebly).
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 4f87d498300..65cfe99649e 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1060,7 +1060,7 @@ next: { /* Try to fix */ TABLE_LIST *derived= res->belong_to_derived; - if (derived->is_merged_derived()) + if (derived->is_merged_derived() && !derived->derived->is_excluded()) { DBUG_PRINT("info", ("convert merged to materialization to resolve the conflict")); |