diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 12:01:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 12:01:52 +0200 |
| commit | cbd52a42ee9b93675e5cdaa043df878c423b6571 (patch) | |
| tree | f7159b893a8dc1d5efd540ef2b3b21227aaf2b6d /sql/item.cc | |
| parent | 70a3cafe4d1aa28e1b6c36d9001bc0d487262976 (diff) | |
| parent | dea3544b2d9bd68961b8e84c3772deda435f15b5 (diff) | |
| download | mariadb-git-cbd52a42ee9b93675e5cdaa043df878c423b6571.tar.gz | |
merge
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 72adb9d0b52..4bcad8a72bc 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2000, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -7075,7 +7075,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 @@ -7087,7 +7087,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); } double result= item->val_real(); if (item->null_value) |