database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MWL#89 - automatic merge with 5.3

Browse Source
This commit is contained in:
unknown
2011-05-17 14:56:02 +03:00
parent 3565a470bf 920d467703
commit c22045aa59
14 changed files with 113 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@ -9508,7 +9508,7 @@ static bool check_simple_equality(Item *left_item, Item *right_item,
Item *orig_field_item= 0;
if (left_item->type() == Item::FIELD_ITEM &&
!((Item_field*)left_item)->depended_from &&
right_item->const_item())
right_item->const_item() && !right_item->is_expensive())
{
orig_field_item= left_item;
field_item= (Item_field *) left_item;
@ -9516,7 +9516,7 @@ static bool check_simple_equality(Item *left_item, Item *right_item,
}
else if (right_item->type() == Item::FIELD_ITEM &&
!((Item_field*)right_item)->depended_from &&
left_item->const_item())
left_item->const_item() && !left_item->is_expensive())
{
orig_field_item= right_item;
field_item= (Item_field *) right_item;