diff options
author | unknown <bar@bar.mysql.r18.ru> | 2003-08-05 11:03:05 +0500 |
---|---|---|
committer | unknown <bar@bar.mysql.r18.ru> | 2003-08-05 11:03:05 +0500 |
commit | fc8b138544c6edb34a1bc26b8cc8b69630bb81b5 (patch) | |
tree | 4cc952660aa92af2c01890655eecf3562e2bd7b5 /sql | |
parent | 691b7584fb3bc42b70fe470ba5fa812d28190141 (diff) | |
download | mariadb-git-fc8b138544c6edb34a1bc26b8cc8b69630bb81b5.tar.gz |
Fix:
CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
INSERT INTO t1 VALUES ('ue');
SELECT DISTINCT s1 FROM t1;
The above returned two rows in error.
Now it returns one row, in latin1_german2_ci: Ü == ue
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index aa146926eb5..3bd131c0e60 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1023,7 +1023,9 @@ int simple_str_key_cmp(void* arg, byte* key1, byte* key2) Item_sum_count_distinct* item = (Item_sum_count_distinct*)arg; CHARSET_INFO *cs=item->key_charset; uint len=item->key_length; - return my_strnncoll(cs, (const uchar*) key1, len, (const uchar*) key2, len); + return cs->coll->strnncollsp(cs, + (const uchar*) key1, len, + (const uchar*) key2, len); } /* |