1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

speed up fill_effective_table_privileges() - avoid calling expensive acl_get()

Browse Source
This commit is contained in:
Sergei Golubchik 2013-10-18 11:46:43 -07:00
parent 02a7291954
commit b054700619
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_acl.cc
View File

@ -10202,11 +10202,18 @@ void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant,
DBUG_VOID_RETURN; // it is slave DBUG_VOID_RETURN; // it is slave
} }
/* db privileges */ if (!thd->db || strcmp(db, thd->db))
grant->privilege|= acl_get(sctx->host, sctx->ip, sctx->priv_user, db, 0); {
/* db privileges for role */ /* db privileges */
if (sctx->priv_role[0]) grant->privilege|= acl_get(sctx->host, sctx->ip, sctx->priv_user, db, 0);
grant->privilege|= acl_get("", "", sctx->priv_role, db, 0); /* db privileges for role */
if (sctx->priv_role[0])
grant->privilege|= acl_get("", "", sctx->priv_role, db, 0);
}
else
{
grant->privilege|= sctx->db_access;
}
/* table privileges */ /* table privileges */
mysql_rwlock_rdlock(&LOCK_grant); mysql_rwlock_rdlock(&LOCK_grant);