diff options
| author | monty@hundin.mysql.fi <> | 2001-08-14 20:33:49 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-14 20:33:49 +0300 |
| commit | 59e7c97dabb4ec2b60b994be194e9764ec16fa00 (patch) | |
| tree | 63b1bcf87d376e768395f4a058416187ee0aad95 /sql/item_sum.h | |
| parent | cf19429793d1492af9c806132082e4f66b484fc1 (diff) | |
| download | mariadb-git-59e7c97dabb4ec2b60b994be194e9764ec16fa00.tar.gz | |
Remove warnings and portability fixes
New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 5500afa43ca..7356eeda28c 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -149,6 +149,7 @@ class Item_sum_count_distinct :public Item_sum_int uint32 *field_lengths; TMP_TABLE_PARAM *tmp_table_param; TREE tree; + uint key_length; // calculated based on max_heap_table_size. If reached, // walk the tree and dump it into MyISAM table @@ -169,7 +170,7 @@ class Item_sum_count_distinct :public Item_sum_int friend int composite_key_cmp(void* arg, byte* key1, byte* key2); friend int dump_leaf(byte* key, uint32 count __attribute__((unused)), - Item_sum_count_distinct* item); + Item_sum_count_distinct* item); public: Item_sum_count_distinct(List<Item> &list) |