diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2012-01-26 10:38:28 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2012-01-26 10:38:28 +0100 |
| commit | ce3458534de452418d3bf2a45be26665fea6f1a9 (patch) | |
| tree | 3bc4cb5f4a1a5a14437335d21c3ea1c616de760f /sql/item.cc | |
| parent | 5fa3887cef229ddf0c50a6d8b3eb0be2134ec692 (diff) | |
| parent | 440d871bf97cff0836192114596477701c39c1f9 (diff) | |
| download | mariadb-git-ce3458534de452418d3bf2a45be26665fea6f1a9.tar.gz | |
merge from 5.1
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 0506b444754..7eaea62d538 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7449,7 +7449,7 @@ int stored_field_cmp_to_item(THD *thd, Field *field, Item *item) return my_time_compare(&field_time, &item_time); } - return stringcmp(field_result, item_result); + return sortcmp(field_result, item_result, field->charset()); } if (res_type == INT_RESULT) return 0; // Both are of type int @@ -7461,7 +7461,7 @@ int stored_field_cmp_to_item(THD *thd, Field *field, Item *item) if (item->null_value) return 0; field_val= field->val_decimal(&field_buf); - return my_decimal_cmp(item_val, field_val); + return my_decimal_cmp(field_val, item_val); } /* The patch for Bug#13463415 started using this function for comparing |