diff options
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index c081fd9dd5f..dac10eafafb 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -59,12 +59,28 @@ void Item::set_name(char *str,uint length) } } -bool Item::eq(const Item *item) const // Only doing this on conds +/* + This function is only called when comparing items in the WHERE clause +*/ + +bool Item::eq(const Item *item, bool binary_cmp) const { return type() == item->type() && name && item->name && !my_strcasecmp(name,item->name); } +bool Item_string::eq(const Item *item, bool binary_cmp) const +{ + if (type() == item->type()) + { + if (binary_cmp) + return !stringcmp(&str_value, &item->str_value); + return !sortcmp(&str_value, &item->str_value); + } + return 0; +} + + /* Get the value of the function as a TIME structure. As a extra convenience the time structure is reset on error! @@ -203,7 +219,7 @@ longlong Item_field::val_int_result() return result_field->val_int(); } -bool Item_field::eq(const Item *item) const +bool Item_field::eq(const Item *item, bool binary_cmp) const { return item->type() == FIELD_ITEM && ((Item_field*) item)->field == field; } @@ -262,7 +278,8 @@ void Item_string::print(String *str) str->append('\''); } -bool Item_null::eq(const Item *item) const { return item->type() == type(); } +bool Item_null::eq(const Item *item, bool binary_cmp) const +{ return item->type() == type(); } double Item_null::val() { null_value=1; return 0.0; } longlong Item_null::val_int() { null_value=1; return 0; } /* ARGSUSED */ |