summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2004-08-19 15:15:10 +0500
committerunknown <bar@mysql.com>2004-08-19 15:15:10 +0500
commit7fbc796d4ad9681fa2381791f8c895be4cbd738b (patch)
tree01ac6df006d72fc8d39e0e1c185bc3c8bc11a7bb /sql/item_cmpfunc.cc
parent6cf9fd7cdb9d102ee1e12408f5a8e871d069618d (diff)
downloadmariadb-git-7fbc796d4ad9681fa2381791f8c895be4cbd738b.tar.gz
Bug#4521: unique key prefix interacts poorly with utf8.
Fix for binary collations for MyISAM and HEAP BTREE. This patch also changes trailing spaces behaviour for binary collations. Binary collations now have PAD characteristic too.
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 23bdad1aae5..3c75dba42da 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -303,10 +303,10 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
my_coll_agg_error((*a)->collation, (*b)->collation, owner->func_name());
return 1;
}
- if (my_binary_compare(cmp_collation.collation))
+ if (cmp_collation.collation == &my_charset_bin)
{
/*
- We are using binary collation, change to compare byte by byte,
+ We are using BLOB/BINARY/VARBINARY, change to compare byte by byte,
without removing end space
*/
if (func == &Arg_comparator::compare_string)