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

Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä
2023-02-10 12:02:11 +02:00
277 changed files with 2048 additions and 1500 deletions

View File

@@ -125,8 +125,7 @@ public:
void get_normalizer(PFS_instr_class *instr_class);
/** Destructor. */
virtual ~PFS_engine_table()
{}
virtual ~PFS_engine_table() = default;
/**
Helper, assign a value to a long field.
@@ -337,11 +336,9 @@ struct PFS_engine_table_share
class PFS_readonly_acl : public ACL_internal_table_access
{
public:
PFS_readonly_acl()
{}
PFS_readonly_acl() = default;
~PFS_readonly_acl()
{}
~PFS_readonly_acl() = default;
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
@@ -357,11 +354,9 @@ extern PFS_readonly_acl pfs_readonly_acl;
class PFS_truncatable_acl : public ACL_internal_table_access
{
public:
PFS_truncatable_acl()
{}
PFS_truncatable_acl() = default;
~PFS_truncatable_acl()
{}
~PFS_truncatable_acl() = default;
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
@@ -377,11 +372,9 @@ extern PFS_truncatable_acl pfs_truncatable_acl;
class PFS_updatable_acl : public ACL_internal_table_access
{
public:
PFS_updatable_acl()
{}
PFS_updatable_acl() = default;
~PFS_updatable_acl()
{}
~PFS_updatable_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
@@ -397,11 +390,9 @@ extern PFS_updatable_acl pfs_updatable_acl;
class PFS_editable_acl : public ACL_internal_table_access
{
public:
PFS_editable_acl()
{}
PFS_editable_acl() = default;
~PFS_editable_acl()
{}
~PFS_editable_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
@@ -416,11 +407,9 @@ extern PFS_editable_acl pfs_editable_acl;
class PFS_unknown_acl : public ACL_internal_table_access
{
public:
PFS_unknown_acl()
{}
PFS_unknown_acl() = default;
~PFS_unknown_acl()
{}
~PFS_unknown_acl() = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;