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:
commit
2a88d0f4fa
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user