diff options
| author | unknown <evgen@sunlight.local> | 2006-03-30 17:14:55 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-03-30 17:14:55 +0400 |
| commit | e0708e2c11b9079fbe85a36fa1790761241b262c (patch) | |
| tree | f1381200f8493f09eb4e5d618305dc65a91312e0 /sql/item_sum.h | |
| parent | b7f090e402a27b5407e059a019dcefcfec483efd (diff) | |
| parent | ff4de9050149bd1ab1727d7f226e094ddcdcd355 (diff) | |
| download | mariadb-git-e0708e2c11b9079fbe85a36fa1790761241b262c.tar.gz | |
Manual merge
myisam/mi_search.c:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index a38530a502c..4bd28d6b1df 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -501,6 +501,7 @@ class Item_sum_count_distinct :public Item_sum_int TABLE *table; uint32 *field_lengths; TMP_TABLE_PARAM *tmp_table_param; + bool force_copy_fields; /* If there are no blobs, we can use a tree, which is faster than heap table. In that case, we still use the table @@ -524,13 +525,14 @@ class Item_sum_count_distinct :public Item_sum_int public: Item_sum_count_distinct(List<Item> &list) :Item_sum_int(list), table(0), field_lengths(0), tmp_table_param(0), - tree(0), original(0), always_null(FALSE) + tree(0), force_copy_fields(0), original(0), always_null(FALSE) { quick_group= 0; } Item_sum_count_distinct(THD *thd, Item_sum_count_distinct *item) :Item_sum_int(thd, item), table(item->table), field_lengths(item->field_lengths), tmp_table_param(item->tmp_table_param), - tree(item->tree), original(item), tree_key_length(item->tree_key_length), + tree(item->tree), force_copy_fields(0), original(item), + tree_key_length(item->tree_key_length), always_null(item->always_null) {} ~Item_sum_count_distinct(); @@ -1086,6 +1088,7 @@ class Item_func_group_concat : public Item_sum bool distinct; bool warning_for_row; bool always_null; + bool force_copy_fields; bool no_appended; /* Following is 0 normal object and pointer to original one for copy |