diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-06-05 11:56:19 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-06-05 11:56:19 +0400 |
| commit | f4dfc609cf89001e948566336f8f2b93ee147723 (patch) | |
| tree | 62a44a1dd397b8ae4b405e2c75c00593ea8a62d2 /sql/sql_union.cc | |
| parent | ab297744b7318645159cd5f9ec26378473cecf52 (diff) | |
| download | mariadb-git-f4dfc609cf89001e948566336f8f2b93ee147723.tar.gz | |
MDEV-16388 Replace member Item::fixed to virtual method is_fixed()
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 266f221ca78..761349c0a95 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -752,11 +752,11 @@ bool st_select_lex_unit::join_union_type_attributes(THD *thd_arg, been fixed yet. An Item_type_holder must be created based on a fixed Item, so use the inner Item instead. */ - DBUG_ASSERT(item_tmp->fixed || + DBUG_ASSERT(item_tmp->is_fixed() || (item_tmp->type() == Item::REF_ITEM && ((Item_ref *)(item_tmp))->ref_type() == Item_ref::OUTER_REF)); - if (!item_tmp->fixed) + if (!item_tmp->is_fixed()) item_tmp= item_tmp->real_item(); holders[holder_pos].add_argument(item_tmp); } |