mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +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
@ -770,13 +770,13 @@ class Duplicate_weedout_picker : public Semi_join_strategy_picker
|
||||
|
||||
bool is_used;
|
||||
public:
|
||||
void set_empty()
|
||||
void set_empty() override
|
||||
{
|
||||
dupsweedout_tables= 0;
|
||||
first_dupsweedout_table= MAX_TABLES;
|
||||
is_used= FALSE;
|
||||
}
|
||||
void set_from_prev(POSITION *prev);
|
||||
void set_from_prev(POSITION *prev) override;
|
||||
|
||||
bool check_qep(JOIN *join,
|
||||
uint idx,
|
||||
@ -786,9 +786,9 @@ public:
|
||||
double *read_time,
|
||||
table_map *handled_fanout,
|
||||
sj_strategy_enum *stratey,
|
||||
POSITION *loose_scan_pos);
|
||||
POSITION *loose_scan_pos) override;
|
||||
|
||||
void mark_used() { is_used= TRUE; }
|
||||
void mark_used() override { is_used= TRUE; }
|
||||
friend void fix_semijoin_strategies_for_picked_join_order(JOIN *join);
|
||||
};
|
||||
|
||||
@ -816,13 +816,13 @@ class Firstmatch_picker : public Semi_join_strategy_picker
|
||||
bool in_firstmatch_prefix() { return (first_firstmatch_table != MAX_TABLES); }
|
||||
void invalidate_firstmatch_prefix() { first_firstmatch_table= MAX_TABLES; }
|
||||
public:
|
||||
void set_empty()
|
||||
void set_empty() override
|
||||
{
|
||||
invalidate_firstmatch_prefix();
|
||||
is_used= FALSE;
|
||||
}
|
||||
|
||||
void set_from_prev(POSITION *prev);
|
||||
void set_from_prev(POSITION *prev) override;
|
||||
bool check_qep(JOIN *join,
|
||||
uint idx,
|
||||
table_map remaining_tables,
|
||||
@ -831,9 +831,9 @@ public:
|
||||
double *read_time,
|
||||
table_map *handled_fanout,
|
||||
sj_strategy_enum *strategy,
|
||||
POSITION *loose_scan_pos);
|
||||
POSITION *loose_scan_pos) override;
|
||||
|
||||
void mark_used() { is_used= TRUE; }
|
||||
void mark_used() override { is_used= TRUE; }
|
||||
friend void fix_semijoin_strategies_for_picked_join_order(JOIN *join);
|
||||
};
|
||||
|
||||
@ -859,13 +859,13 @@ public:
|
||||
uint loosescan_parts; /* Number of keyparts to be kept distinct */
|
||||
|
||||
bool is_used;
|
||||
void set_empty()
|
||||
void set_empty() override
|
||||
{
|
||||
first_loosescan_table= MAX_TABLES;
|
||||
is_used= FALSE;
|
||||
}
|
||||
|
||||
void set_from_prev(POSITION *prev);
|
||||
void set_from_prev(POSITION *prev) override;
|
||||
bool check_qep(JOIN *join,
|
||||
uint idx,
|
||||
table_map remaining_tables,
|
||||
@ -874,8 +874,8 @@ public:
|
||||
double *read_time,
|
||||
table_map *handled_fanout,
|
||||
sj_strategy_enum *strategy,
|
||||
POSITION *loose_scan_pos);
|
||||
void mark_used() { is_used= TRUE; }
|
||||
POSITION *loose_scan_pos) override;
|
||||
void mark_used() override { is_used= TRUE; }
|
||||
|
||||
friend class Loose_scan_opt;
|
||||
friend void best_access_path(JOIN *join,
|
||||
@ -907,13 +907,13 @@ class Sj_materialization_picker : public Semi_join_strategy_picker
|
||||
table_map sjm_scan_need_tables;
|
||||
|
||||
public:
|
||||
void set_empty()
|
||||
void set_empty() override
|
||||
{
|
||||
sjm_scan_need_tables= 0;
|
||||
sjm_scan_last_inner= 0;
|
||||
is_used= FALSE;
|
||||
}
|
||||
void set_from_prev(POSITION *prev);
|
||||
void set_from_prev(POSITION *prev) override;
|
||||
bool check_qep(JOIN *join,
|
||||
uint idx,
|
||||
table_map remaining_tables,
|
||||
@ -922,8 +922,8 @@ public:
|
||||
double *read_time,
|
||||
table_map *handled_fanout,
|
||||
sj_strategy_enum *strategy,
|
||||
POSITION *loose_scan_pos);
|
||||
void mark_used() { is_used= TRUE; }
|
||||
POSITION *loose_scan_pos) override;
|
||||
void mark_used() override { is_used= TRUE; }
|
||||
|
||||
friend void fix_semijoin_strategies_for_picked_join_order(JOIN *join);
|
||||
};
|
||||
@ -2012,8 +2012,8 @@ class store_key_field: public store_key
|
||||
}
|
||||
}
|
||||
|
||||
enum Type type() const { return FIELD_STORE_KEY; }
|
||||
const char *name() const { return field_name; }
|
||||
enum Type type() const override { return FIELD_STORE_KEY; }
|
||||
const char *name() const override { return field_name; }
|
||||
|
||||
void change_source_field(Item_field *fld_item)
|
||||
{
|
||||
@ -2022,7 +2022,7 @@ class store_key_field: public store_key
|
||||
}
|
||||
|
||||
protected:
|
||||
enum store_key_result copy_inner()
|
||||
enum store_key_result copy_inner() override
|
||||
{
|
||||
TABLE *table= copy_field.to_field->table;
|
||||
MY_BITMAP *old_map= dbug_tmp_use_all_columns(table,
|
||||
@ -2065,11 +2065,11 @@ public:
|
||||
{}
|
||||
|
||||
|
||||
enum Type type() const { return ITEM_STORE_KEY; }
|
||||
const char *name() const { return "func"; }
|
||||
enum Type type() const override { return ITEM_STORE_KEY; }
|
||||
const char *name() const override { return "func"; }
|
||||
|
||||
protected:
|
||||
enum store_key_result copy_inner()
|
||||
enum store_key_result copy_inner() override
|
||||
{
|
||||
TABLE *table= to_field->table;
|
||||
MY_BITMAP *old_map= dbug_tmp_use_all_columns(table,
|
||||
@ -2118,12 +2118,12 @@ public:
|
||||
:store_key_item(arg, new_item, FALSE), inited(0)
|
||||
{}
|
||||
|
||||
enum Type type() const { return CONST_ITEM_STORE_KEY; }
|
||||
const char *name() const { return "const"; }
|
||||
bool store_key_is_const() { return true; }
|
||||
enum Type type() const override { return CONST_ITEM_STORE_KEY; }
|
||||
const char *name() const override { return "const"; }
|
||||
bool store_key_is_const() override { return true; }
|
||||
|
||||
protected:
|
||||
enum store_key_result copy_inner()
|
||||
enum store_key_result copy_inner() override
|
||||
{
|
||||
int res;
|
||||
if (!inited)
|
||||
|
Reference in New Issue
Block a user