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 remote-tracking branch 'origin/11.2' into 11.4

Browse Source
This commit is contained in:
Alexander Barkov
2024-07-09 17:41:26 +04:00
parent 4ffeca643d 8aad19ddfc
commit 5fb07d942b
636 changed files with 14636 additions and 11289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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