diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2002-12-19 16:42:35 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2002-12-19 16:42:35 +0400 |
| commit | 1c88b5f064cc645a49901fafb63fd1959d2452cc (patch) | |
| tree | eeb8206ea16b6a599f4157f9ddbcd759c62702d9 /sql/item_sum.h | |
| parent | d19ba004e45cb33f5dce8182b633a54af3b9c4c3 (diff) | |
| download | mariadb-git-1c88b5f064cc645a49901fafb63fd1959d2452cc.tar.gz | |
COUNT(DISTINCT field) now honors charsets
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 50375fbf77c..d16a1f2224e 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -156,7 +156,8 @@ class Item_sum_count_distinct :public Item_sum_int TMP_TABLE_PARAM *tmp_table_param; TREE tree; uint key_length; - + CHARSET_INFO *key_charset; + // calculated based on max_heap_table_size. If reached, // walk the tree and dump it into MyISAM table uint max_elements_in_tree; @@ -175,6 +176,8 @@ class Item_sum_count_distinct :public Item_sum_int int tree_to_myisam(); friend int composite_key_cmp(void* arg, byte* key1, byte* key2); + friend int simple_str_key_cmp(void* arg, byte* key1, byte* key2); + friend int simple_raw_key_cmp(void* arg, byte* key1, byte* key2); friend int dump_leaf(byte* key, uint32 count __attribute__((unused)), Item_sum_count_distinct* item); |