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/item_subselect.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/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 048ec6a4fa1..ffb2bb4ff11 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -2028,7 +2028,7 @@ bool Item_in_subselect::fix_having(Item *having, SELECT_LEX *select_lex) { bool fix_res= 0; DBUG_ASSERT(thd); - if (!having->fixed) + if (!having->is_fixed()) { select_lex->having_fix_field= 1; fix_res= having->fix_fields(thd, 0); @@ -2365,9 +2365,9 @@ Item_in_subselect::create_row_in_to_exists_cond(JOIN * join, Item *item_having_part2= 0; for (uint i= 0; i < cols_num; i++) { - DBUG_ASSERT((left_expr->fixed && + DBUG_ASSERT((left_expr->is_fixed() && - select_lex->ref_pointer_array[i]->fixed) || + select_lex->ref_pointer_array[i]->is_fixed()) || (select_lex->ref_pointer_array[i]->type() == REF_ITEM && ((Item_ref*)(select_lex->ref_pointer_array[i]))->ref_type() == Item_ref::OUTER_REF)); @@ -2436,8 +2436,8 @@ Item_in_subselect::create_row_in_to_exists_cond(JOIN * join, for (uint i= 0; i < cols_num; i++) { Item *item, *item_isnull; - DBUG_ASSERT((left_expr->fixed && - select_lex->ref_pointer_array[i]->fixed) || + DBUG_ASSERT((left_expr->is_fixed() && + select_lex->ref_pointer_array[i]->is_fixed()) || (select_lex->ref_pointer_array[i]->type() == REF_ITEM && ((Item_ref*)(select_lex->ref_pointer_array[i]))->ref_type() == Item_ref::OUTER_REF)); |