Commit 2a88d0f4 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug17265

parents 85e54a08 0d3cf6b0
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -5116,9 +5116,9 @@ bool Item_direct_view_ref::eq(const Item *item, bool binary_cmp) const
    if (item_ref->ref_type() == VIEW_REF)
    {
      Item *item_ref_ref= *(item_ref->ref);
      DBUG_ASSERT((*ref)->type() == FIELD_ITEM &&
                  (item_ref_ref->type() == FIELD_ITEM));
      return (*ref == item_ref_ref);
      DBUG_ASSERT((*ref)->real_item()->type() == FIELD_ITEM &&
                  (item_ref_ref->real_item()->type() == FIELD_ITEM));
      return ((*ref)->real_item() == item_ref_ref->real_item());
    }
  }
  return FALSE;