mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
MDEV-33746 Supply missing override markings
Find and fix missing virtual override markings. Updates cmake maintainer flags to include -Wsuggest-override and -Winconsistent-missing-override.
This commit is contained in:
committed by
Dave Gosselin
parent
ab448d4b34
commit
db0c28eff8
14
sql/field.h
14
sql/field.h
@ -3156,7 +3156,7 @@ public:
|
||||
:Field_temporal(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
|
||||
unireg_check_arg, field_name_arg)
|
||||
{}
|
||||
bool validate_value_in_record(THD *thd, const uchar *record) const;
|
||||
bool validate_value_in_record(THD *thd, const uchar *record) const override;
|
||||
};
|
||||
|
||||
|
||||
@ -4161,7 +4161,7 @@ public:
|
||||
{
|
||||
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);
|
||||
}
|
||||
@ -4507,7 +4507,7 @@ public:
|
||||
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);
|
||||
}
|
||||
@ -5119,20 +5119,20 @@ public:
|
||||
m_table(NULL)
|
||||
{}
|
||||
~Field_row();
|
||||
en_fieldtype tmp_engine_column_type(bool use_packed_rows) const
|
||||
en_fieldtype tmp_engine_column_type(bool use_packed_rows) const override
|
||||
{
|
||||
DBUG_ASSERT(0);
|
||||
return Field::tmp_engine_column_type(use_packed_rows);
|
||||
}
|
||||
enum_conv_type rpl_conv_type_from(const Conv_source &source,
|
||||
const Relay_log_info *rli,
|
||||
const Conv_param ¶m) const
|
||||
const Conv_param ¶m) const override
|
||||
{
|
||||
DBUG_ASSERT(0);
|
||||
return CONV_TYPE_IMPOSSIBLE;
|
||||
}
|
||||
Virtual_tmp_table **virtual_tmp_table_addr() { return &m_table; }
|
||||
bool sp_prepare_and_store_item(THD *thd, Item **value);
|
||||
Virtual_tmp_table **virtual_tmp_table_addr() override { return &m_table; }
|
||||
bool sp_prepare_and_store_item(THD *thd, Item **value) override;
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user