diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-03-01 21:10:59 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-03-01 21:10:59 +0100 |
| commit | 6c414fcf89510215d6d3466eb9992d444eadae89 (patch) | |
| tree | 181c6b01ffe0b78d92f724d91e8315bed81e5f7e /sql/item_sum.h | |
| parent | 66832b619510f5b9724d8db1eac48bdafb9225e9 (diff) | |
| download | mariadb-git-6c414fcf89510215d6d3466eb9992d444eadae89.tar.gz | |
MDEV-5542: GROUP_CONCAT truncate output to 65.536 chars when using DISTINCT or ORDER BY
port of mysql fix WL#6098
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index db3312c42f4..db38cf56723 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -481,8 +481,7 @@ public: } virtual void make_unique() { force_copy_fields= TRUE; } Item *get_tmp_table_item(THD *thd); - virtual Field *create_tmp_field(bool group, TABLE *table, - uint convert_blob_length); + virtual Field *create_tmp_field(bool group, TABLE *table); virtual bool collect_outer_ref_processor(uchar *param); bool init_sum_func_check(THD *thd); bool check_sum_func(THD *thd, Item **ref); @@ -845,7 +844,7 @@ public: return has_with_distinct() ? "avg(distinct " : "avg("; } Item *copy_or_same(THD* thd); - Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length); + Field *create_tmp_field(bool group, TABLE *table); void cleanup() { count= 0; @@ -901,7 +900,7 @@ public: const char *func_name() const { return sample ? "var_samp(" : "variance("; } Item *copy_or_same(THD* thd); - Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length); + Field *create_tmp_field(bool group, TABLE *table); enum Item_result result_type () const { return REAL_RESULT; } enum_field_types field_type() const { return MYSQL_TYPE_DOUBLE;} void cleanup() @@ -979,8 +978,7 @@ protected: bool any_value() { return was_values; } void no_rows_in_result(); void restore_to_before_no_rows_in_result(); - Field *create_tmp_field(bool group, TABLE *table, - uint convert_blob_length); + Field *create_tmp_field(bool group, TABLE *table); }; |