diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-03-04 18:01:59 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-04 18:01:59 +0400 |
| commit | 3cbb978d51ce694c941671f8bc4efd673d80e4e0 (patch) | |
| tree | ec01d4c8c14546cc3ecf4ff069124834d4ee8959 /sql/item.cc | |
| parent | 9dfa4eb60af7661e613f900d620de15d29bce54b (diff) | |
| download | mariadb-git-3cbb978d51ce694c941671f8bc4efd673d80e4e0.tar.gz | |
stringcmp() and sortcmp() have been unified
into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index decd0ec044b..3c6b85e933b 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -120,8 +120,8 @@ 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 !sortcmp(&str_value, &item->str_value, &my_charset_bin); + return !sortcmp(&str_value, &item->str_value, charset()); } return 0; } @@ -1355,7 +1355,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 !stringcmp(&field_tmp,item_result); + return !sortcmp(&field_tmp,item_result,&my_charset_bin); } if (res_type == INT_RESULT) return 1; // Both where of type int |