mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 12:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-33746 Supply missing override markings

Browse source 
Find and fix missing virtual override markings.  Updates cmake
maintainer flags to include -Wsuggest-override and
-Winconsistent-missing-override.
This commit is contained in:
Dave Gosselin 2024-06-12 09:46:26 -04:00 • committed by Dave Gosselin
commit db0c28eff8
306 changed files with 8823 additions and 8796 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/perfschema/cursor_by_account.h
View file

@ -43,9 +43,9 @@ class cursor_by_account : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_account(const PFS_engine_table_share *share);

6
storage/perfschema/cursor_by_host.h
View file

@ -43,9 +43,9 @@ class cursor_by_host : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_host(const PFS_engine_table_share *share);

6
storage/perfschema/cursor_by_thread.h
View file

@ -43,9 +43,9 @@ class cursor_by_thread : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_thread(const PFS_engine_table_share *share);

6
storage/perfschema/cursor_by_thread_connect_attr.h
View file

@ -62,9 +62,9 @@ class cursor_by_thread_connect_attr : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_thread_connect_attr(const PFS_engine_table_share *share);

6
storage/perfschema/cursor_by_user.h
View file

@ -43,9 +43,9 @@ class cursor_by_user : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
cursor_by_user(const PFS_engine_table_share *share);

62
storage/perfschema/ha_perfschema.h
View file

@ -53,10 +53,10 @@ public:
~ha_perfschema();
const char *index_type(uint) { return ""; }
const char *index_type(uint) override { return ""; }
/** Capabilities of the performance schema tables. */
ulonglong table_flags(void) const
ulonglong table_flags(void) const override
{
/*
About HA_FAST_KEY_READ:
@ -86,25 +86,25 @@ public:
Operations supported by indexes.
None, there are no indexes.
*/
ulong index_flags(uint , uint , bool ) const
ulong index_flags(uint , uint , bool ) const override
{ return 0; }
uint max_supported_record_length(void) const
uint max_supported_record_length(void) const override
{ return HA_MAX_REC_LENGTH; }
uint max_supported_keys(void) const
uint max_supported_keys(void) const override
{ return 0; }
uint max_supported_key_parts(void) const
uint max_supported_key_parts(void) const override
{ return 0; }
uint max_supported_key_length(void) const
uint max_supported_key_length(void) const override
{ return 0; }
ha_rows estimate_rows_upper_bound(void)
ha_rows estimate_rows_upper_bound(void) override
{ return HA_POS_ERROR; }
double scan_time(void)
double scan_time(void) override
{ return 1.0; }
/**
@ -114,22 +114,22 @@ public:
@param test_if_locked unused
@return 0 on success
*/
int open(const char *name, int mode, uint test_if_locked);
int open(const char *name, int mode, uint test_if_locked) override;
/**
Close a table handle.
@sa open.
*/
int close(void);
int close(void) override;
/**
Write a row.
@param buf the row to write
@return 0 on success
*/
int write_row(const uchar *buf);
int write_row(const uchar *buf) override;
void use_hidden_primary_key();
void use_hidden_primary_key() override;
/**
Update a row.
@ -137,29 +137,29 @@ public:
@param new_data the row new values
@return 0 on success
*/
int update_row(const uchar *old_data, const uchar *new_data);
int update_row(const uchar *old_data, const uchar *new_data) override;
/**
Delete a row.
@param buf the row to delete
@return 0 on success
*/
int delete_row(const uchar *buf);
int delete_row(const uchar *buf) override;
int rnd_init(bool scan);
int rnd_init(bool scan) override;
/**
Scan end.
@sa rnd_init.
*/
int rnd_end(void);
int rnd_end(void) override;
/**
Iterator, fetch the next row.
@param[out] buf the row fetched.
@return 0 on success
*/
int rnd_next(uchar *buf);
int rnd_next(uchar *buf) override;
/**
Iterator, fetch the row at a given position.
@ -167,42 +167,42 @@ public:
@param pos the row position
@return 0 on success
*/
int rnd_pos(uchar *buf, uchar *pos);
int rnd_pos(uchar *buf, uchar *pos) override;
/**
Read the row current position.
@param record the current row
*/
void position(const uchar *record);
void position(const uchar *record) override;
int info(uint);
int info(uint) override;
int delete_all_rows(void);
int delete_all_rows(void) override;
int truncate();
int truncate() override;
int delete_table(const char *from);
int delete_table(const char *from) override;
int rename_table(const char * from, const char * to);
int rename_table(const char * from, const char * to) override;
int create(const char *name, TABLE *form,
HA_CREATE_INFO *create_info);
HA_CREATE_INFO *create_info) override;
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type);
enum thr_lock_type lock_type) override;
virtual uint8 table_cache_type(void)
uint8 table_cache_type(void) override
{ return HA_CACHE_TBL_NOCACHE; }
virtual my_bool register_query_cache_table
my_bool register_query_cache_table
(THD *, const char *, uint , qc_engine_callback *engine_callback,
ulonglong *)
ulonglong *) override
{
*engine_callback= 0;
return FALSE;
}
virtual void print_error(int error, myf errflags);
void print_error(int error, myf errflags) override;
private:
/**

4
storage/perfschema/pfs_account.cc
View file

@ -666,7 +666,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_account *pfs)
void operator()(PFS_account *pfs) override
{
PFS_user *user= sanitize_user(pfs->m_user);
PFS_host *host= sanitize_host(pfs->m_host);
@ -699,7 +699,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_account *pfs)
void operator()(PFS_account *pfs) override
{
if (pfs->m_username_length > 0 && pfs->m_hostname_length > 0)
{

10
storage/perfschema/pfs_engine_table.cc
View file

@ -343,13 +343,13 @@ static PFS_engine_table_share *all_shares[]=
class PFS_silent_check_intact : public Table_check_intact
{
protected:
virtual void report_error(uint code, const char *fmt, ...) {}
void report_error(uint code, const char *fmt, ...) override {}
public:
PFS_silent_check_intact()
{}
~PFS_silent_check_intact()
~PFS_silent_check_intact() override
{}
};
@ -672,12 +672,12 @@ class PFS_internal_schema_access : public ACL_internal_schema_access
public:
PFS_internal_schema_access() = default;
~PFS_internal_schema_access() = default;
~PFS_internal_schema_access() override = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
const ACL_internal_table_access *lookup(const char *name) const;
const ACL_internal_table_access *lookup(const char *name) const override;
};
ACL_internal_access_result

22
storage/perfschema/pfs_engine_table.h
View file

@ -340,8 +340,8 @@ public:
~PFS_readonly_acl() = default;
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_readonly_acl. */
@ -358,8 +358,8 @@ public:
~PFS_truncatable_acl() = default;
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_truncatable_acl. */
@ -377,7 +377,7 @@ public:
~PFS_updatable_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_updatable_acl. */
@ -395,7 +395,7 @@ public:
~PFS_editable_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_editable_acl. */
@ -412,7 +412,7 @@ public:
~PFS_unknown_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_unknown_acl. */
@ -430,7 +430,7 @@ public:
~PFS_readonly_world_acl()
{}
virtual ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const override;
};
@ -449,7 +449,7 @@ public:
~PFS_truncatable_world_acl()
{}
virtual ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const override;
};
@ -468,8 +468,8 @@ class PFS_readonly_processlist_acl : public PFS_readonly_acl {
~PFS_readonly_processlist_acl()
{}
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const override;
};
/** Singleton instance of PFS_readonly_processlist_acl */

2
storage/perfschema/pfs_host.cc
View file

@ -349,7 +349,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_host *pfs)
void operator()(PFS_host *pfs) override
{
pfs->aggregate(true);
if (pfs->get_refcount() == 0)

4
storage/perfschema/pfs_instr_class.cc
View file

@ -2022,7 +2022,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_table_share *pfs)
void operator()(PFS_table_share *pfs) override
{
pfs->refresh_setup_object_flags(m_thread);
}
@ -2045,7 +2045,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_program *pfs)
void operator()(PFS_program *pfs) override
{
pfs->refresh_setup_object_flags(m_thread);
}

2
storage/perfschema/pfs_setup_actor.cc
View file

@ -231,7 +231,7 @@ public:
: m_pins(pins)
{}
virtual void operator()(PFS_setup_actor *pfs)
void operator()(PFS_setup_actor *pfs) override
{
lf_hash_delete(&setup_actor_hash, m_pins,
pfs->m_key.m_hash_key, pfs->m_key.m_key_length);

2
storage/perfschema/pfs_setup_object.cc
View file

@ -231,7 +231,7 @@ public:
: m_pins(pins)
{}
virtual void operator()(PFS_setup_object *pfs)
void operator()(PFS_setup_object *pfs) override
{
lf_hash_delete(&setup_object_hash, m_pins,
pfs->m_key.m_hash_key, pfs->m_key.m_key_length);

2
storage/perfschema/pfs_user.cc
View file

@ -314,7 +314,7 @@ public:
: m_thread(thread)
{}
virtual void operator()(PFS_user *pfs)
void operator()(PFS_user *pfs) override
{
pfs->aggregate(true);
if (pfs->get_refcount() == 0)

26
storage/perfschema/pfs_variable.h
View file

@ -205,7 +205,7 @@ public:
Find_THD_variable() : m_unsafe_thd(NULL) {}
Find_THD_variable(THD *unsafe_thd) : m_unsafe_thd(unsafe_thd) {}
virtual bool operator()(THD *thd)
bool operator()(THD *thd) override
{
//TODO: filter bg threads?
if (thd != m_unsafe_thd)
@ -608,18 +608,18 @@ public:
private:
/* Build SHOW_var array. */
bool init_show_var_array(enum_var_type scope, bool strict);
bool do_initialize_session(void);
bool do_initialize_session(void) override;
/* Global */
int do_materialize_global(void);
int do_materialize_global(void) override;
/* Global and Session - THD */
int do_materialize_all(THD* thd);
int do_materialize_all(THD* thd) override;
/* Session - THD */
int do_materialize_session(THD* thd);
int do_materialize_session(THD* thd) override;
/* Session - PFS_thread */
int do_materialize_session(PFS_thread *thread);
int do_materialize_session(PFS_thread *thread) override;
/* Single variable - PFS_thread */
int do_materialize_session(PFS_thread *pfs_thread, uint index);
int do_materialize_session(PFS_thread *pfs_thread, uint index) override;
/* Temporary mem_root to use for materialization. */
MEM_ROOT m_mem_sysvar;
@ -660,14 +660,14 @@ protected:
bool m_show_command;
private:
bool do_initialize_session(void);
bool do_initialize_session(void) override;
int do_materialize_global(void);
int do_materialize_global(void) override;
/* Global and Session - THD */
int do_materialize_all(THD* thd);
int do_materialize_session(THD *thd);
int do_materialize_session(PFS_thread *thread);
int do_materialize_session(PFS_thread *thread, uint index) { return 0; }
int do_materialize_all(THD* thd) override;
int do_materialize_session(THD *thd) override;
int do_materialize_session(PFS_thread *thread) override;
int do_materialize_session(PFS_thread *thread, uint index) override { return 0; }
int do_materialize_client(PFS_client *pfs_client);
/* Callback to sum user, host or account status variables. */

16
storage/perfschema/pfs_visitor.cc
View file

@ -49,7 +49,7 @@ public:
: m_visitor(visitor)
{}
virtual void operator()(THD *thd)
void operator()(THD *thd) override
{
m_visitor->visit_THD(thd);
}
@ -132,7 +132,7 @@ public:
: m_visitor(visitor), m_host(host)
{}
virtual void operator()(THD *thd)
void operator()(THD *thd) override
{
PSI_thread *psi= thd->get_psi();
PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@ -221,7 +221,7 @@ public:
: m_visitor(visitor), m_user(user)
{}
virtual void operator()(THD *thd)
void operator()(THD *thd) override
{
PSI_thread *psi= thd->get_psi();
PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@ -310,7 +310,7 @@ public:
: m_visitor(visitor), m_account(account)
{}
virtual void operator()(THD *thd)
void operator()(THD *thd) override
{
PSI_thread *psi= thd->get_psi();
PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@ -752,7 +752,7 @@ public:
: m_visitor(visitor)
{}
virtual void operator()(PFS_table_share *pfs)
void operator()(PFS_table_share *pfs) override
{
if (pfs->m_enabled)
{
@ -772,7 +772,7 @@ public:
: m_visitor(visitor)
{}
virtual void operator()(PFS_table *pfs)
void operator()(PFS_table *pfs) override
{
PFS_table_share *safe_share= sanitize_table_share(pfs->m_share);
if (safe_share != NULL)
@ -811,7 +811,7 @@ public:
: m_visitor(visitor), m_share(share)
{}
virtual void operator()(PFS_table *pfs)
void operator()(PFS_table *pfs) override
{
if (pfs->m_share == m_share)
{
@ -852,7 +852,7 @@ public:
: m_visitor(visitor), m_share(share), m_index(index)
{}
virtual void operator()(PFS_table *pfs)
void operator()(PFS_table *pfs) override
{
if (pfs->m_share == m_share)
{

160
storage/perfschema/pfs_visitor.h
View file

@ -314,11 +314,11 @@ public:
/** Constructor. */
PFS_connection_wait_visitor(PFS_instr_class *klass);
virtual ~PFS_connection_wait_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -336,11 +336,11 @@ public:
/** Constructor. */
PFS_connection_all_wait_visitor();
virtual ~PFS_connection_all_wait_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** Wait statistic collected. */
PFS_single_stat m_stat;
@ -359,11 +359,11 @@ public:
/** Constructor. */
PFS_connection_stage_visitor(PFS_stage_class *klass);
virtual ~PFS_connection_stage_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -381,11 +381,11 @@ public:
/** Constructor. */
PFS_connection_statement_visitor(PFS_statement_class *klass);
virtual ~PFS_connection_statement_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -403,11 +403,11 @@ public:
/** Constructor. */
PFS_connection_all_statement_visitor();
virtual ~PFS_connection_all_statement_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** Statement statistic collected. */
PFS_statement_stat m_stat;
@ -426,11 +426,11 @@ public:
/** Constructor. */
PFS_connection_transaction_visitor(PFS_transaction_class *klass);
virtual ~PFS_connection_transaction_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -450,11 +450,11 @@ public:
/** Constructor. */
PFS_connection_all_transaction_visitor();
virtual ~PFS_connection_all_transaction_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** Statement statistic collected. */
PFS_transaction_stat m_stat;
@ -474,11 +474,11 @@ public:
/** Constructor. */
PFS_connection_stat_visitor();
virtual ~PFS_connection_stat_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** Connection statistic collected. */
PFS_connection_stat m_stat;
@ -494,11 +494,11 @@ public:
/** Constructor. */
PFS_connection_memory_visitor(PFS_memory_class *klass);
virtual ~PFS_connection_memory_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
/** EVENT_NAME instrument index. */
uint m_index;
@ -516,12 +516,12 @@ public:
/** Constructor. */
PFS_connection_status_visitor(STATUS_VAR *status_vars);
virtual ~PFS_connection_status_visitor();
virtual void visit_global();
virtual void visit_host(PFS_host *pfs);
virtual void visit_account(PFS_account *pfs);
virtual void visit_user(PFS_user *pfs);
virtual void visit_thread(PFS_thread *pfs);
virtual void visit_THD(THD *thd);
void visit_global() override;
void visit_host(PFS_host *pfs) override;
void visit_account(PFS_account *pfs) override;
void visit_user(PFS_user *pfs) override;
void visit_thread(PFS_thread *pfs) override;
void visit_THD(THD *thd) override;
private:
STATUS_VAR *m_status_vars;
@ -536,16 +536,16 @@ class PFS_instance_wait_visitor : public PFS_instance_visitor
public:
PFS_instance_wait_visitor();
virtual ~PFS_instance_wait_visitor();
virtual void visit_mutex_class(PFS_mutex_class *pfs);
virtual void visit_rwlock_class(PFS_rwlock_class *pfs);
virtual void visit_cond_class(PFS_cond_class *pfs);
virtual void visit_file_class(PFS_file_class *pfs);
virtual void visit_socket_class(PFS_socket_class *pfs);
virtual void visit_mutex(PFS_mutex *pfs);
virtual void visit_rwlock(PFS_rwlock *pfs);
virtual void visit_cond(PFS_cond *pfs);
virtual void visit_file(PFS_file *pfs);
virtual void visit_socket(PFS_socket *pfs);
void visit_mutex_class(PFS_mutex_class *pfs) override;
void visit_rwlock_class(PFS_rwlock_class *pfs) override;
void visit_cond_class(PFS_cond_class *pfs) override;
void visit_file_class(PFS_file_class *pfs) override;
void visit_socket_class(PFS_socket_class *pfs) override;
void visit_mutex(PFS_mutex *pfs) override;
void visit_rwlock(PFS_rwlock *pfs) override;
void visit_cond(PFS_cond *pfs) override;
void visit_file(PFS_file *pfs) override;
void visit_socket(PFS_socket *pfs) override;
/** Wait statistic collected. */
PFS_single_stat m_stat;
@ -560,9 +560,9 @@ class PFS_object_wait_visitor : public PFS_object_visitor
public:
PFS_object_wait_visitor();
virtual ~PFS_object_wait_visitor();
virtual void visit_global();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_global() override;
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Object wait statistic collected. */
PFS_single_stat m_stat;
@ -577,9 +577,9 @@ class PFS_table_io_wait_visitor : public PFS_object_visitor
public:
PFS_table_io_wait_visitor();
virtual ~PFS_table_io_wait_visitor();
virtual void visit_global();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_global() override;
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Table io wait statistic collected. */
PFS_single_stat m_stat;
@ -594,8 +594,8 @@ class PFS_table_io_stat_visitor : public PFS_object_visitor
public:
PFS_table_io_stat_visitor();
virtual ~PFS_table_io_stat_visitor();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Table io statistic collected. */
PFS_table_io_stat m_stat;
@ -610,8 +610,8 @@ class PFS_index_io_stat_visitor : public PFS_object_visitor
public:
PFS_index_io_stat_visitor();
virtual ~PFS_index_io_stat_visitor();
virtual void visit_table_share_index(PFS_table_share *pfs, uint index);
virtual void visit_table_index(PFS_table *pfs, uint index);
void visit_table_share_index(PFS_table_share *pfs, uint index) override;
void visit_table_index(PFS_table *pfs, uint index) override;
/** Index io statistic collected. */
PFS_table_io_stat m_stat;
@ -626,9 +626,9 @@ class PFS_table_lock_wait_visitor : public PFS_object_visitor
public:
PFS_table_lock_wait_visitor();
virtual ~PFS_table_lock_wait_visitor();
virtual void visit_global();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_global() override;
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Table lock wait statistic collected. */
PFS_single_stat m_stat;
@ -643,8 +643,8 @@ class PFS_table_lock_stat_visitor : public PFS_object_visitor
public:
PFS_table_lock_stat_visitor();
virtual ~PFS_table_lock_stat_visitor();
virtual void visit_table_share(PFS_table_share *pfs);
virtual void visit_table(PFS_table *pfs);
void visit_table_share(PFS_table_share *pfs) override;
void visit_table(PFS_table *pfs) override;
/** Table lock statistic collected. */
PFS_table_lock_stat m_stat;
@ -659,8 +659,8 @@ class PFS_instance_socket_io_stat_visitor : public PFS_instance_visitor
public:
PFS_instance_socket_io_stat_visitor();
virtual ~PFS_instance_socket_io_stat_visitor();
virtual void visit_socket_class(PFS_socket_class *pfs);
virtual void visit_socket(PFS_socket *pfs);
void visit_socket_class(PFS_socket_class *pfs) override;
void visit_socket(PFS_socket *pfs) override;
/** Wait and byte count statistics collected. */
PFS_socket_io_stat m_socket_io_stat;
@ -675,8 +675,8 @@ class PFS_instance_file_io_stat_visitor : public PFS_instance_visitor
public:
PFS_instance_file_io_stat_visitor();
virtual ~PFS_instance_file_io_stat_visitor();
virtual void visit_file_class(PFS_file_class *pfs);
virtual void visit_file(PFS_file *pfs);
void visit_file_class(PFS_file_class *pfs) override;
void visit_file(PFS_file *pfs) override;
/** Wait and byte count statistics collected. */
PFS_file_io_stat m_file_io_stat;

10
storage/perfschema/table_accounts.h
View file

@ -57,10 +57,10 @@ public:
static int delete_all_rows();
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
protected:
@ -70,7 +70,7 @@ public:
~table_accounts() = default;
private:
virtual void make_row(PFS_account *pfs);
void make_row(PFS_account *pfs) override;
/** Table share lock. */
static THR_LOCK m_table_lock;

6
storage/perfschema/table_all_instr.h
View file

@ -76,9 +76,9 @@ class table_all_instr : public PFS_engine_table
public:
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_all_instr(const PFS_engine_table_share *share);

16
storage/perfschema/table_esgs_by_account_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_by_account_by_event_name();

16
storage/perfschema/table_esgs_by_host_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_by_host_by_event_name();

16
storage/perfschema/table_esgs_by_thread_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_by_thread_by_event_name();

16
storage/perfschema/table_esgs_by_user_by_event_name.h
View file

@ -96,16 +96,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_by_user_by_event_name();

16
storage/perfschema/table_esgs_global_by_event_name.h
View file

@ -62,16 +62,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esgs_global_by_event_name();

16
storage/perfschema/table_esms_by_account_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_account_by_event_name();

14
storage/perfschema/table_esms_by_digest.h
View file

@ -65,15 +65,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_digest();

16
storage/perfschema/table_esms_by_host_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_host_by_event_name();

14
storage/perfschema/table_esms_by_program.h
View file

@ -75,15 +75,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_program();

16
storage/perfschema/table_esms_by_thread_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_thread_by_event_name();

16
storage/perfschema/table_esms_by_user_by_event_name.h
View file

@ -91,16 +91,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_by_user_by_event_name();

16
storage/perfschema/table_esms_global_by_event_name.h
View file

@ -62,16 +62,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_esms_global_by_event_name();

16
storage/perfschema/table_ets_by_account_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_by_account_by_event_name();

16
storage/perfschema/table_ets_by_host_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_by_host_by_event_name();

16
storage/perfschema/table_ets_by_thread_by_event_name.h
View file

@ -99,16 +99,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_by_thread_by_event_name();

16
storage/perfschema/table_ets_by_user_by_event_name.h
View file

@ -95,16 +95,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_by_user_by_event_name();

16
storage/perfschema/table_ets_global_by_event_name.h
View file

@ -66,16 +66,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ets_global_by_event_name();

32
storage/perfschema/table_events_stages.h
View file

@ -100,10 +100,10 @@ struct pos_events_stages_history : public PFS_double_index
class table_events_stages_common : public PFS_engine_table
{
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_stages_common(const PFS_engine_table_share *share, void *pos);
@ -128,10 +128,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_stages_current();
@ -163,10 +163,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_stages_history();
@ -195,10 +195,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_stages_history_long();

32
storage/perfschema/table_events_statements.h
View file

@ -183,10 +183,10 @@ struct pos_events_statements_history : public PFS_double_index
class table_events_statements_common : public PFS_engine_table
{
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_statements_common(const PFS_engine_table_share *share, void *pos);
@ -215,10 +215,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_statements_current();
@ -252,10 +252,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_statements_history();
@ -286,10 +286,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_statements_history_long();

32
storage/perfschema/table_events_transactions.h
View file

@ -127,10 +127,10 @@ struct pos_events_transactions_history : public PFS_double_index
class table_events_transactions_common : public PFS_engine_table
{
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_transactions_common(const PFS_engine_table_share *share, void *pos);
@ -156,10 +156,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_transactions_current();
@ -198,10 +198,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_transactions_history();
@ -231,10 +231,10 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_transactions_history_long();

26
storage/perfschema/table_events_waits.h
View file

@ -139,10 +139,10 @@ struct pos_events_waits_history : public PFS_double_index
class table_events_waits_common : public PFS_engine_table
{
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_waits_common(const PFS_engine_table_share *share, void *pos);
@ -173,9 +173,9 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_waits_current();
@ -209,9 +209,9 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
table_events_waits_history();
@ -242,9 +242,9 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;;
protected:
table_events_waits_history_long();

18
storage/perfschema/table_events_waits_summary.h
View file

@ -67,16 +67,16 @@ protected:
void make_instr_row(PFS_instr *pfs, PFS_instr_class *klass,
const void *object_instance_begin,
PFS_single_stat *pfs_stat);
virtual void make_mutex_row(PFS_mutex *pfs);
virtual void make_rwlock_row(PFS_rwlock *pfs);
virtual void make_cond_row(PFS_cond *pfs);
virtual void make_file_row(PFS_file *pfs);
virtual void make_socket_row(PFS_socket *pfs);
void make_mutex_row(PFS_mutex *pfs) override;
void make_rwlock_row(PFS_rwlock *pfs) override;
void make_cond_row(PFS_cond *pfs) override;
void make_file_row(PFS_file *pfs) override;
void make_socket_row(PFS_socket *pfs) override;
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_events_waits_summary_by_instance();

14
storage/perfschema/table_ews_by_account_by_event_name.h
View file

@ -103,15 +103,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_by_account_by_event_name();

14
storage/perfschema/table_ews_by_host_by_event_name.h
View file

@ -103,15 +103,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_by_host_by_event_name();

14
storage/perfschema/table_ews_by_thread_by_event_name.h
View file

@ -102,15 +102,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_by_thread_by_event_name();

14
storage/perfschema/table_ews_by_user_by_event_name.h
View file

@ -103,15 +103,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_by_user_by_event_name();

14
storage/perfschema/table_ews_global_by_event_name.h
View file

@ -91,15 +91,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_ews_global_by_event_name();

14
storage/perfschema/table_file_instances.h
View file

@ -61,15 +61,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_file_instances();

14
storage/perfschema/table_file_summary_by_event_name.h
View file

@ -62,15 +62,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_file_summary_by_event_name();

14
storage/perfschema/table_file_summary_by_instance.h
View file

@ -70,15 +70,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_file_summary_by_instance();

16
storage/perfschema/table_global_status.h
View file

@ -75,16 +75,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_global_status();
public:

16
storage/perfschema/table_global_variables.h
View file

@ -74,16 +74,16 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_global_variables();
public:

14
storage/perfschema/table_host_cache.h
View file

@ -114,15 +114,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_host_cache();

12
storage/perfschema/table_hosts.h
View file

@ -57,11 +57,11 @@ public:
static int delete_all_rows();
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
protected:
table_hosts();
@ -70,7 +70,7 @@ public:
~table_hosts() = default;
private:
virtual void make_row(PFS_host *pfs);
void make_row(PFS_host *pfs) override;
/** Table share lock. */
static THR_LOCK m_table_lock;

14
storage/perfschema/table_md_locks.h
View file

@ -69,15 +69,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_metadata_locks();

14
storage/perfschema/table_mems_by_account_by_event_name.h
View file

@ -92,15 +92,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_by_account_by_event_name();

14
storage/perfschema/table_mems_by_host_by_event_name.h
View file

@ -92,15 +92,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_by_host_by_event_name();

14
storage/perfschema/table_mems_by_thread_by_event_name.h
View file

@ -92,15 +92,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_by_thread_by_event_name();

14
storage/perfschema/table_mems_by_user_by_event_name.h
View file

@ -92,15 +92,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_by_user_by_event_name();

14
storage/perfschema/table_mems_global_by_event_name.h
View file

@ -94,15 +94,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mems_global_by_event_name();

14
storage/perfschema/table_os_global_by_type.h
View file

@ -93,15 +93,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_os_global_by_type();

14
storage/perfschema/table_performance_timers.h
View file

@ -59,15 +59,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
protected:
table_performance_timers();

14
storage/perfschema/table_prepared_stmt_instances.h
View file

@ -94,15 +94,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_prepared_stmt_instances();

14
storage/perfschema/table_replication_applier_configuration.h
View file

@ -83,10 +83,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_applier_configuration();
@ -98,9 +98,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_applier_status.h
View file

@ -94,10 +94,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_applier_status();
@ -109,9 +109,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_applier_status_by_coordinator.h
View file

@ -100,10 +100,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_applier_status_by_coordinator();
@ -115,9 +115,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_applier_status_by_worker.h
View file

@ -158,10 +158,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_applier_status_by_worker();
@ -173,9 +173,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_connection_configuration.h
View file

@ -128,10 +128,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_connection_configuration();
@ -143,9 +143,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_connection_status.h
View file

@ -126,10 +126,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_connection_status();
@ -141,9 +141,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_group_member_stats.h
View file

@ -91,10 +91,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_group_member_stats();
@ -106,9 +106,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

14
storage/perfschema/table_replication_group_members.h
View file

@ -84,10 +84,10 @@ protected:
@param read_all true if all columns are read.
*/
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_replication_group_members();
@ -99,9 +99,9 @@ public:
static PFS_engine_table_share m_share;
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
};

2
storage/perfschema/table_session_account_connect_attrs.h
View file

@ -46,7 +46,7 @@ public:
~table_session_account_connect_attrs() = default;
protected:
virtual bool thread_fits(PFS_thread *thread);
bool thread_fits(PFS_thread *thread) override;
private:
/** Table share lock. */

6
storage/perfschema/table_session_connect.h
View file

@ -69,10 +69,10 @@ public:
~table_session_connect();
protected:
virtual void make_row(PFS_thread *pfs, uint ordinal);
void make_row(PFS_thread *pfs, uint ordinal) override;
virtual bool thread_fits(PFS_thread *thread);
virtual int read_row_values(TABLE *table, unsigned char *buf,
Field **fields, bool read_all);
int read_row_values(TABLE *table, unsigned char *buf,
Field **fields, bool read_all) override;
protected:
/** Current row. */
row_session_connect_attrs m_row;

16
storage/perfschema/table_session_status.h
View file

@ -76,16 +76,16 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_session_status();
public:

16
storage/perfschema/table_session_variables.h
View file

@ -74,16 +74,16 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_session_variables();
public:

28
storage/perfschema/table_setup_actors.h
View file

@ -71,24 +71,24 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
virtual int delete_row_values(TABLE *table,
const unsigned char *buf,
Field **fields);
int delete_row_values(TABLE *table,
const unsigned char *buf,
Field **fields) override;
table_setup_actors();

22
storage/perfschema/table_setup_consumers.h
View file

@ -59,20 +59,20 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
table_setup_consumers();

26
storage/perfschema/table_setup_instruments.h
View file

@ -97,21 +97,21 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
table_setup_instruments();
public:

30
storage/perfschema/table_setup_objects.h
View file

@ -70,24 +70,24 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
virtual int delete_row_values(TABLE *table,
const unsigned char *buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
int delete_row_values(TABLE *table,
const unsigned char *buf,
Field **fields) override;
table_setup_objects();

22
storage/perfschema/table_setup_timers.h
View file

@ -55,20 +55,20 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
table_setup_timers();

14
storage/perfschema/table_socket_instances.h
View file

@ -73,15 +73,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_socket_instances();

14
storage/perfschema/table_socket_summary_by_event_name.h
View file

@ -63,15 +63,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_socket_summary_by_event_name();

14
storage/perfschema/table_socket_summary_by_instance.h
View file

@ -66,15 +66,15 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_socket_summary_by_instance();

16
storage/perfschema/table_status_by_account.h
View file

@ -111,16 +111,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_status_by_account();
public:

16
storage/perfschema/table_status_by_host.h
View file

@ -109,16 +109,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_status_by_host();
public:

16
storage/perfschema/table_status_by_thread.h
View file

@ -107,16 +107,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_status_by_thread();
public:

16
storage/perfschema/table_status_by_user.h
View file

@ -109,16 +109,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_status_by_user();
public:

42
storage/perfschema/table_sync_instances.h
View file

@ -65,15 +65,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_mutex_instances();
@ -123,15 +123,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_rwlock_instances();
@ -175,15 +175,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
private:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_cond_instances();

16
storage/perfschema/table_table_handles.h
View file

@ -69,16 +69,16 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_table_handles();

20
storage/perfschema/table_threads.h
View file

@ -95,16 +95,16 @@ public:
static PFS_engine_table* create();
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
virtual int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields);
int update_row_values(TABLE *table,
const unsigned char *old_buf,
const unsigned char *new_buf,
Field **fields) override;
protected:
table_threads();
@ -113,7 +113,7 @@ public:
~table_threads() = default;
private:
virtual void make_row(PFS_thread *pfs);
void make_row(PFS_thread *pfs) override;
/** Table share lock. */
static THR_LOCK m_table_lock;

16
storage/perfschema/table_tiws_by_index_usage.h
View file

@ -87,16 +87,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_tiws_by_index_usage();

16
storage/perfschema/table_tiws_by_table.h
View file

@ -62,16 +62,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_tiws_by_table();

16
storage/perfschema/table_tlws_by_table.h
View file

@ -62,16 +62,16 @@ public:
static int delete_all_rows();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_tlws_by_table();

10
storage/perfschema/table_users.h
View file

@ -57,10 +57,10 @@ public:
static int delete_all_rows();
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
protected:
@ -70,7 +70,7 @@ public:
~table_users() = default;
private:
virtual void make_row(PFS_user *pfs);
void make_row(PFS_user *pfs) override;
/** Table share lock. */
static THR_LOCK m_table_lock;

2
storage/perfschema/table_uvar_by_thread.cc
View file

@ -46,7 +46,7 @@ public:
: m_unsafe_thd(unsafe_thd)
{}
virtual bool operator()(THD *thd)
bool operator()(THD *thd) override
{
if (thd != m_unsafe_thd)
return false;

14
storage/perfschema/table_uvar_by_thread.h
View file

@ -154,15 +154,15 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_uvar_by_thread();

16
storage/perfschema/table_variables_by_thread.h
View file

@ -107,16 +107,16 @@ public:
static PFS_engine_table* create();
static ha_rows get_row_count();
virtual int rnd_init(bool scan);
virtual int rnd_next();
virtual int rnd_pos(const void *pos);
virtual void reset_position(void);
int rnd_init(bool scan) override;
int rnd_next() override;
int rnd_pos(const void *pos) override;
void reset_position(void) override;
protected:
virtual int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all);
int read_row_values(TABLE *table,
unsigned char *buf,
Field **fields,
bool read_all) override;
table_variables_by_thread();
public: