database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge tag '11.1' into 11.2

Browse Source 
MariaDB 11.1.3 release
This commit is contained in:
Oleksandr Byelkin
2023-11-14 18:28:37 +01:00
parent e6acddf121 0f5613a25f
commit 0427c4739e
608 changed files with 15628 additions and 9174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_acl.cc
View File

@ -5433,6 +5433,15 @@ public:
};
privilege_t GRANT_INFO::all_privilege()
{
return (grant_table_user ? grant_table_user->cols : NO_ACL) |
(grant_table_role ? grant_table_role->cols : NO_ACL) |
(grant_public ? grant_public->cols : NO_ACL) |
privilege;
}
void GRANT_NAME::set_user_details(const char *h, const char *d,
const char *u, const char *t,
bool is_routine)
@ -8450,8 +8459,7 @@ bool check_grant(THD *thd, privilege_t want_access, TABLE_LIST *tables,
if (!(~t_ref->grant.privilege & want_access))
continue;
if ((want_access&= ~(t_ref->grant.aggregate_cols() |
t_ref->grant.privilege)))
if ((want_access&= ~t_ref->grant.all_privilege()))
{
goto err; // impossible
}
@ -8508,6 +8516,7 @@ inline privilege_t GRANT_INFO::aggregate_cols()
(grant_public ? grant_public->cols : NO_ACL);
}
void GRANT_INFO::refresh(const Security_context *sctx,
const char *db, const char *table)
{