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
This commit is contained in:
aelkin@mysql.com 2006-02-22 18:53:34 +02:00
commit 35861f3006

View file

@ -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;