database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-06-24 13:09:47 +03:00
parent 49b4a6e26d d9dd673fee
commit 0076eb3d4e
333 changed files with 6721 additions and 6118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
storage/perfschema/table_replication_applier_status.h
View File

@@ -92,10 +92,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();
@@ -107,9 +107,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;
};