summaryrefslogtreecommitdiff
path: root/sql/item_buff.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-03-04 18:01:59 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-03-04 18:01:59 +0400
commit3cbb978d51ce694c941671f8bc4efd673d80e4e0 (patch)
treeec01d4c8c14546cc3ecf4ff069124834d4ee8959 /sql/item_buff.cc
parent9dfa4eb60af7661e613f900d620de15d29bce54b (diff)
downloadmariadb-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_buff.cc')
-rw-r--r--sql/item_buff.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_buff.cc b/sql/item_buff.cc
index 573d4ab17e3..c4431294dff 100644
--- a/sql/item_buff.cc
+++ b/sql/item_buff.cc
@@ -56,10 +56,8 @@ bool Item_str_buff::cmp(void)
}
else if (null_value)
return 0; // new and old value was null
- else if (!item->binary())
- tmp= sortcmp(&value,res) != 0;
else
- tmp= stringcmp(&value,res) != 0;
+ tmp= sortcmp(&value,res,item->charset()) != 0;
if (tmp)
value.copy(*res); // Remember for next cmp
return tmp;