1 files changed, 7 insertions, 7 deletions

diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index ec1954bd3bd..b850e88ac6d 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -852,7 +852,7 @@ bool subquery_types_allow_materialization(THD* thd, Item_in_subselect *in_subs)
   Item *left_exp= in_subs->left_exp();
   DBUG_ENTER("subquery_types_allow_materialization");
 
-  DBUG_ASSERT(left_exp->is_fixed());
+  DBUG_ASSERT(left_exp->fixed());
 
   List_iterator<Item> it(in_subs->unit->first_select()->item_list);
   uint elements= in_subs->unit->first_select()->item_list.elements;
@@ -955,7 +955,7 @@ bool make_in_exists_conversion(THD *thd, JOIN *join, Item_in_subselect *item)
   /* 
     We're going to finalize IN->EXISTS conversion. 
     Normally, IN->EXISTS conversion takes place inside the 
-    Item_subselect::fix_fields() call, where item_subselect->is_fixed()==FALSE (as
+    Item_subselect::fix_fields() call, where item_subselect->fixed()==FALSE (as
     fix_fields() haven't finished yet) and item_subselect->changed==FALSE (as 
     the conversion haven't been finalized)
 
@@ -982,7 +982,7 @@ bool make_in_exists_conversion(THD *thd, JOIN *join, Item_in_subselect *item)
   DBUG_ASSERT(item->fixed());
 
   Item *substitute= item->substitution;
-  bool do_fix_fields= !item->substitution->is_fixed();
+  bool do_fix_fields= !item->substitution->fixed();
   /*
     The Item_subselect has already been wrapped with Item_in_optimizer, so we
     should search for item->optimizer, not 'item'.
@@ -1334,7 +1334,7 @@ bool convert_join_subqueries_to_semijoins(JOIN *join)
     DBUG_ASSERT(in_subq->fixed());
 
     Item *substitute= in_subq->substitution;
-    bool do_fix_fields= !in_subq->substitution->is_fixed();
+    bool do_fix_fields= !in_subq->substitution->fixed();
     Item **tree= (in_subq->emb_on_expr_nest == NO_JOIN_NEST)?
                    &join->conds : &(in_subq->emb_on_expr_nest->on_expr);
     Item *replace_me= in_subq->original_item();
@@ -1885,7 +1885,7 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred)
                      subq_lex->ref_pointer_array[i]);
       if (!item_eq)
         DBUG_RETURN(TRUE);
-      DBUG_ASSERT(left_exp->element_index(i)->is_fixed());
+      DBUG_ASSERT(left_exp->element_index(i)->fixed());
       if (left_exp_orig->element_index(i) !=
           left_exp->element_index(i))
         thd->change_item_tree(item_eq->arguments(),
@@ -6440,8 +6440,8 @@ bool JOIN::choose_subquery_plan(table_map join_tables)
   /* A strategy must be chosen earlier. */
   DBUG_ASSERT(in_subs->has_strategy());
   DBUG_ASSERT(in_to_exists_where || in_to_exists_having);
-  DBUG_ASSERT(!in_to_exists_where || in_to_exists_where->is_fixed());
-  DBUG_ASSERT(!in_to_exists_having || in_to_exists_having->is_fixed());
+  DBUG_ASSERT(!in_to_exists_where || in_to_exists_where->fixed());
+  DBUG_ASSERT(!in_to_exists_having || in_to_exists_having->fixed());
 
   /* The original QEP of the subquery. */
   Join_plan_state save_qep(table_count);