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

Merge remote-tracking branch 'origin/11.2' into 11.4

This commit is contained in:
Alexander Barkov
2024-07-09 17:41:26 +04:00
636 changed files with 14636 additions and 11289 deletions

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 */