diff options
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 68b034c9213..811e9d5c59c 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -481,11 +481,9 @@ public: } virtual void make_unique() { force_copy_fields= TRUE; } Item *get_tmp_table_item(THD *thd); - Field *create_tmp_field(bool group, TABLE *table, - uint convert_blob_length) + Field *create_tmp_field(bool group, TABLE *table) { - return Item::create_tmp_field(group, table, convert_blob_length, - MY_INT32_NUM_DECIMAL_DIGITS); + return Item::create_tmp_field(group, table, MY_INT32_NUM_DECIMAL_DIGITS); } virtual bool collect_outer_ref_processor(uchar *param); bool init_sum_func_check(THD *thd); @@ -855,7 +853,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; @@ -911,7 +909,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() @@ -989,8 +987,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); }; @@ -1096,7 +1093,6 @@ public: fixed= true; } table_map used_tables() const { return (table_map) 1L; } - Field *get_tmp_table_field() { DBUG_ASSERT(0); return NULL; } void set_result_field(Field *) { DBUG_ASSERT(0); } void save_in_result_field(bool no_conversions) { DBUG_ASSERT(0); } }; |