summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 4d06d0d7765..b9a6a164a86 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -175,12 +175,13 @@ bool Item::eq(const Item *item, bool binary_cmp) const
!my_strcasecmp(system_charset_info,name,item->name);
}
+
bool Item_string::eq(const Item *item, bool binary_cmp) const
{
if (type() == item->type())
{
if (binary_cmp)
- return !sortcmp(&str_value, &item->str_value, &my_charset_bin);
+ return !stringcmp(&str_value, &item->str_value);
return !sortcmp(&str_value, &item->str_value, collation.collation);
}
return 0;
@@ -1823,7 +1824,7 @@ bool field_is_equal_to_item(Field *field,Item *item)
if (item->null_value)
return 1; // This must be true
field->val_str(&field_tmp,&field_tmp);
- return !sortcmp(&field_tmp,item_result,&my_charset_bin);
+ return !stringcmp(&field_tmp,item_result);
}
if (res_type == INT_RESULT)
return 1; // Both where of type int