diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-08-05 09:58:00 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-08-05 09:58:00 +0300 |
| commit | 4a8ab8ac5678c3ea84c8f6adeeaf6ddf1a8ac69c (patch) | |
| tree | 46610d580b8026f52b7785517655879276aa1c8c /sql/item_sum.cc | |
| parent | f94d0178ca9e87e6f61950650f8b256a1bff057c (diff) | |
| parent | 6181294dab759a6f5197573f164ee061668b1d18 (diff) | |
| download | mariadb-git-4a8ab8ac5678c3ea84c8f6adeeaf6ddf1a8ac69c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index fde39135358..651302ecec5 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -199,7 +199,7 @@ Item_sum_hybrid::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) decimals=item->decimals; maybe_null=item->maybe_null; unsigned_flag=item->unsigned_flag; - set_charset(item->charset()); + collation.set(item->collation); result_field=0; null_value=1; fix_length_and_dec(); @@ -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); } /* |