diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
| commit | 8cbb14ef5d180687f131bc44a4e8fc84083d033c (patch) | |
| tree | 091f11e2d20f95656a7b12294782eb0488fd4fcc /sql/item_sum.h | |
| parent | 4345868382ca3525de5eb432302b6b9b957b47c1 (diff) | |
| parent | b85aa20065504bdda4bc03c2bd7eb7de38865c5d (diff) | |
| download | mariadb-git-8cbb14ef5d180687f131bc44a4e8fc84083d033c.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 5c8ff520259..c1373f6c1fc 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1593,6 +1593,7 @@ class Item_func_group_concat : public Item_sum String *separator; TREE tree_base; TREE *tree; + size_t tree_len; Item **ref_pointer_array; /** @@ -1630,7 +1631,9 @@ class Item_func_group_concat : public Item_sum element_count count __attribute__((unused)), void* item_arg); protected: - virtual Field *make_string_field(TABLE *table); + Field *make_string_field(TABLE *table); + + bool repack_tree(THD *thd); public: Item_func_group_concat(THD *thd, Name_resolution_context *context_arg, @@ -1686,8 +1689,8 @@ public: String* val_str(String* str); Item *copy_or_same(THD* thd); void no_rows_in_result() {} - virtual void print(String *str, enum_query_type query_type); - virtual bool change_context_processor(void *cntx) + void print(String *str, enum_query_type query_type); + bool change_context_processor(void *cntx) { context= (Name_resolution_context *)cntx; return FALSE; } Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_func_group_concat>(thd, mem_root, this); } |