diff options
author | holyfoot@deer.(none) <> | 2006-03-05 20:48:31 +0400 |
---|---|---|
committer | holyfoot@deer.(none) <> | 2006-03-05 20:48:31 +0400 |
commit | a920d0df863a7598384ab2cb18d94e9597aa5538 (patch) | |
tree | 7a3b57f4569f99339619fa489254c48a54c56ae8 /sql/item_sum.cc | |
parent | 1a07140515793828453d08be1bbe7f417b5a71a8 (diff) | |
download | mariadb-git-a920d0df863a7598384ab2cb18d94e9597aa5538.tar.gz |
bug #15745 (COUNT(DISTINCT CONCAT(x,y)) returns wrong result
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index a3a25ec8d6f..804adcd022d 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2541,9 +2541,9 @@ bool Item_sum_count_distinct::setup(THD *thd) Field *f= *field; enum enum_field_types type= f->type(); tree_key_length+= f->pack_length(); - if (!f->binary() && (type == MYSQL_TYPE_STRING || - type == MYSQL_TYPE_VAR_STRING || - type == MYSQL_TYPE_VARCHAR)) + if ((type == MYSQL_TYPE_VARCHAR) || + !f->binary() && (type == MYSQL_TYPE_STRING || + type == MYSQL_TYPE_VAR_STRING)) { all_binary= FALSE; break; |