Skip to content

Commit c32e59a

Browse files
committed
Fix clang++ errors on missing 'override' specifier
1 parent 15623c7 commit c32e59a

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

sql/item_sum.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,27 +1982,27 @@ class Item_func_group_concat : public Item_sum
19821982

19831983
Item_func_group_concat(THD *thd, Item_func_group_concat *item);
19841984
~Item_func_group_concat();
1985-
void cleanup();
1985+
void cleanup() override;
19861986

1987-
enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;}
1988-
const char *func_name() const { return "group_concat("; }
1989-
const Type_handler *type_handler() const
1987+
enum Sumfunctype sum_func () const override {return GROUP_CONCAT_FUNC;}
1988+
const char *func_name() const override { return "group_concat("; }
1989+
const Type_handler *type_handler() const override
19901990
{
19911991
if (too_big_for_varchar())
19921992
return &type_handler_blob;
19931993
return &type_handler_varchar;
19941994
}
1995-
void clear();
1996-
bool add()
1995+
void clear() override;
1996+
bool add() override
19971997
{
19981998
return add(skip_nulls());
19991999
}
2000-
void reset_field() { DBUG_ASSERT(0); } // not used
2001-
void update_field() { DBUG_ASSERT(0); } // not used
2002-
bool fix_fields(THD *,Item **);
2003-
bool setup(THD *thd);
2004-
void make_unique();
2005-
double val_real()
2000+
void reset_field() override { DBUG_ASSERT(0); } // not used
2001+
void update_field() override { DBUG_ASSERT(0); } // not used
2002+
bool fix_fields(THD *,Item **) override;
2003+
bool setup(THD *thd) override;
2004+
void make_unique() override;
2005+
double val_real() override
20062006
{
20072007
int error;
20082008
const char *end;
@@ -2012,7 +2012,7 @@ class Item_func_group_concat : public Item_sum
20122012
end= res->ptr() + res->length();
20132013
return (my_strtod(res->ptr(), (char**) &end, &error));
20142014
}
2015-
longlong val_int()
2015+
longlong val_int() override
20162016
{
20172017
String *res;
20182018
char *end_ptr;
@@ -2022,21 +2022,21 @@ class Item_func_group_concat : public Item_sum
20222022
end_ptr= (char*) res->ptr()+ res->length();
20232023
return my_strtoll10(res->ptr(), &end_ptr, &error);
20242024
}
2025-
my_decimal *val_decimal(my_decimal *decimal_value)
2025+
my_decimal *val_decimal(my_decimal *decimal_value) override
20262026
{
20272027
return val_decimal_from_string(decimal_value);
20282028
}
2029-
bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
2029+
bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) override
20302030
{
20312031
return get_date_from_string(thd, ltime, fuzzydate);
20322032
}
2033-
String* val_str(String* str);
2034-
Item *copy_or_same(THD* thd);
2035-
void no_rows_in_result() {}
2036-
void print(String *str, enum_query_type query_type);
2037-
bool change_context_processor(void *cntx)
2033+
String* val_str(String* str) override;
2034+
Item *copy_or_same(THD* thd) override;
2035+
void no_rows_in_result() override {}
2036+
void print(String *str, enum_query_type query_type) override;
2037+
bool change_context_processor(void *cntx) override
20382038
{ context= (Name_resolution_context *)cntx; return FALSE; }
2039-
Item *get_copy(THD *thd)
2039+
Item *get_copy(THD *thd) override
20402040
{ return get_item_copy<Item_func_group_concat>(thd, this); }
20412041
qsort_cmp2 get_comparator_function_for_distinct();
20422042
qsort_cmp2 get_comparator_function_for_order_by();

0 commit comments

Comments
 (0)