Added override to all releveant methods in Item (and a few other classes)

Other things: - Remove inline and virtual for methods that are overrides - Added a 'final' to some Item classes

Author: montywi

plugin/func_test/plugin.cc

@@ -24,12 +24,12 @@ class Item_func_sysconst_test :public Item_func_sysconst
 {
 public:
  Item_func_sysconst_test(THD *thd): Item_func_sysconst(thd) {}
- String *val_str(String *str)
+ String *val_str(String *str) override
  {
  null_value= str->copy(STRING_WITH_LEN("sysconst_test"), system_charset_info);
  return null_value ? NULL : str;
  }
- bool fix_length_and_dec()
+ bool fix_length_and_dec() override
  {
  max_length= MAX_FIELD_NAME * system_charset_info->mbmaxlen;
  set_maybe_null();
@@ -40,8 +40,9 @@ class Item_func_sysconst_test :public Item_func_sysconst
  static LEX_CSTRING name= {STRING_WITH_LEN("sysconst_test") };
  return name;
  }
- const char *fully_qualified_func_name() const { return "sysconst_test()"; }
- Item *get_copy(THD *thd)
+ const char *fully_qualified_func_name() const override
+ { return "sysconst_test()"; }
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_sysconst_test>(thd, this); }
 };
 

plugin/type_inet/item_inetfunc.h

@@ -27,25 +27,25 @@
 
 class Item_func_inet_aton : public Item_longlong_func
 {
- bool check_arguments() const
+ bool check_arguments() const override
  { return check_argument_types_can_return_text(0, arg_count); }
 public:
  Item_func_inet_aton(THD *thd, Item *a): Item_longlong_func(thd, a) {}
- longlong val_int();
+ longlong val_int() override;
  LEX_CSTRING func_name_cstring() const override
  {
  static LEX_CSTRING name= {STRING_WITH_LEN("inet_aton") };
  return name;
  }
- bool fix_length_and_dec()
+ bool fix_length_and_dec() override
  {
  decimals= 0;
  max_length= 21;
  set_maybe_null();
  unsigned_flag= 1;
  return FALSE;
  }
- Item *get_copy(THD *thd)
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_inet_aton>(thd, this); }
 };
 
@@ -59,20 +59,20 @@ class Item_func_inet_ntoa : public Item_str_func
 public:
  Item_func_inet_ntoa(THD *thd, Item *a): Item_str_func(thd, a)
  { }
- String* val_str(String* str);
+ String *val_str(String* str) override;
  LEX_CSTRING func_name_cstring() const override
  {
  static LEX_CSTRING name= {STRING_WITH_LEN("inet_ntoa") };
  return name;
  }
- bool fix_length_and_dec()
+ bool fix_length_and_dec() override
  {
  decimals= 0;
  fix_length_and_charset(3 * 8 + 7, default_charset());
  set_maybe_null();
  return FALSE;
  }
- Item *get_copy(THD *thd)
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_inet_ntoa>(thd, this); }
 };
 
@@ -111,17 +111,17 @@ class Item_func_inet6_aton : public Item_str_func
  static LEX_CSTRING name= {STRING_WITH_LEN("inet6_aton") };
  return name;
  }
- virtual bool fix_length_and_dec()
+ bool fix_length_and_dec() override
  {
  decimals= 0;
  fix_length_and_charset(16, &my_charset_bin);
  set_maybe_null();
  return FALSE;
  }
- Item *get_copy(THD *thd)
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_inet6_aton>(thd, this); }
 
- String *val_str(String *to);
+ String *val_str(String *to) override;
 };
 
 
@@ -143,7 +143,7 @@ class Item_func_inet6_ntoa : public Item_str_ascii_func
  return name;
  }
 
- virtual bool fix_length_and_dec()
+ bool fix_length_and_dec() override
  {
  decimals= 0;
 
@@ -155,8 +155,8 @@ class Item_func_inet6_ntoa : public Item_str_ascii_func
  set_maybe_null();;
  return FALSE;
  }
- String *val_str_ascii(String *to);
- Item *get_copy(THD *thd)
+ String *val_str_ascii(String *to) override;
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_inet6_ntoa>(thd, this); }
 };
 
@@ -178,10 +178,10 @@ class Item_func_is_ipv4 : public Item_func_inet_bool_base
  static LEX_CSTRING name= {STRING_WITH_LEN("is_ipv4") };
  return name;
  }
- Item *get_copy(THD *thd)
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_is_ipv4>(thd, this); }
 
- longlong val_int();
+ longlong val_int() override;
 };
 
 
@@ -201,10 +201,10 @@ class Item_func_is_ipv6 : public Item_func_inet_bool_base
  static LEX_CSTRING name= {STRING_WITH_LEN("is_ipv6") };
  return name;
  }
- Item *get_copy(THD *thd)
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_is_ipv6>(thd, this); }
 
- longlong val_int();
+ longlong val_int() override;
 };
 
 
@@ -223,9 +223,9 @@ class Item_func_is_ipv4_compat : public Item_func_inet_bool_base
  static LEX_CSTRING name= {STRING_WITH_LEN("is_ipv4_compat") };
  return name;
  }
- Item *get_copy(THD *thd)
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_is_ipv4_compat>(thd, this); }
- longlong val_int();
+ longlong val_int() override;
 };
 
 
@@ -244,9 +244,9 @@ class Item_func_is_ipv4_mapped : public Item_func_inet_bool_base
  static LEX_CSTRING name= {STRING_WITH_LEN("is_ipv4_mapped") };
  return name;
  }
- Item *get_copy(THD *thd)
+ Item *get_copy(THD *thd) override
  { return get_item_copy<Item_func_is_ipv4_mapped>(thd, this); }
- longlong val_int();
+ longlong val_int() override;
 };
 
 #endif // ITEM_INETFUNC_INCLUDED

sql/field.h

@@ -1198,7 +1198,7 @@ class Field: public Value_source
  virtual uint16 key_part_flag() const { return 0; }
  virtual uint16 key_part_length_bytes() const { return 0; }
  virtual uint32 key_length() const { return pack_length(); }
- virtual const Type_handler *type_handler() const= 0;
+ virtual const Type_handler *type_handler() const = 0;
  virtual enum_field_types type() const
  {
  return type_handler()->field_type();
@@ -4155,7 +4155,7 @@ class Field_varstring :public Field_longstr {
  {
  return (uint32) field_length + sort_suffix_length();
  }
- virtual uint32 sort_suffix_length() const override
+ uint32 sort_suffix_length() const override
  {
  return (field_charset() == &my_charset_bin ? length_bytes : 0);
  }
@@ -4505,7 +4505,7 @@ class Field_blob :public Field_longstr {
  uint32 sort_length() const override;
  uint32 sort_suffix_length() const override;
  uint32 value_length() override { return get_length(); }
- virtual uint32 max_data_length() const override
+ uint32 max_data_length() const override
  {
  return (uint32) (((ulonglong) 1 << (packlength*8)) -1);
  }

sql/ha_partition.h

@@ -467,7 +467,7 @@ class ha_partition :public handler
  }
  Partition_share *get_part_share() { return part_share; }
  handler *clone(const char *name, MEM_ROOT *mem_root) override;
- virtual void set_part_info(partition_info *part_info) override
+ void set_part_info(partition_info *part_info) override
  {
  m_part_info= part_info;
  m_is_sub_partitioned= part_info->is_sub_partitioned();