mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 19:55:32 +02:00
Code Issues Projects Releases Packages Wiki 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
commit 5fb07d942b
636 changed files with 14643 additions and 11296 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/sql_acl.h
View file

@ -312,7 +312,7 @@ public:
:m_command(command)
{ }
bool is_revoke() const { return m_command == SQLCOM_REVOKE; }
enum_sql_command sql_command_code() const { return m_command; }
enum_sql_command sql_command_code() const override { return m_command; }
};
@ -326,7 +326,7 @@ public:
Sql_cmd_grant_proxy(enum_sql_command command, privilege_t grant_option)
:Sql_cmd_grant(command), m_grant_option(grant_option)
{ }
bool execute(THD *thd);
bool execute(THD *thd) override;
};
@ -353,7 +353,7 @@ public:
Sql_cmd_grant_table(enum_sql_command command, const Grant_privilege &grant)
:Sql_cmd_grant_object(command, grant)
{ }
bool execute(THD *thd);
bool execute(THD *thd) override;
};
@ -367,7 +367,7 @@ public:
:Sql_cmd_grant_object(command, grant),
m_sph(sph)
{ }
bool execute(THD *thd);
bool execute(THD *thd) override;
};
#endif /* SQL_ACL_INCLUDED */