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

Added debug info to rebuild_roles_mappings

Browse Source 
Also fixed a bug regarding the HASH iteration. It previously got
the stop condition from a different hashtable and this caused errors
when the hash sizes were different.
This commit is contained in:
Vicențiu Ciorbaru
2013-10-17 15:09:58 -07:00
committed by Sergei Golubchik
parent 0a9428cffc
commit 9506a07159
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_acl.cc
View File

@ -2081,6 +2081,7 @@ my_bool add_role_user_mapping(ROLE_GRANT_PAIR *mapping)
void rebuild_role_grants(void) void rebuild_role_grants(void)
{ {
DBUG_ENTER("rebuild_role_grants");
/* /*
Reset every user's and role's role_grants array Reset every user's and role's role_grants array
*/ */
@ -2094,17 +2095,20 @@ void rebuild_role_grants(void)
/* /*
Rebuild the direct links between users and roles in ACL_USER::role_grants Rebuild the direct links between users and roles in ACL_USER::role_grants
*/ */
for (uint i=0; i < acl_roles.records; i++) { for (uint i=0; i < acl_roles_mappings.records; i++) {
ROLE_GRANT_PAIR *mapping= (ROLE_GRANT_PAIR*) ROLE_GRANT_PAIR *mapping= (ROLE_GRANT_PAIR*)
my_hash_element(&acl_roles_mappings, i); my_hash_element(&acl_roles_mappings, i);
my_bool status = add_role_user_mapping(mapping);
/* /*
The invariant chosen is that acl_roles_mappings should _always_ The invariant chosen is that acl_roles_mappings should _always_
only contain valid entries, referencing correct user and role grants. only contain valid entries, referencing correct user and role grants.
If add_role_user_mapping detects an invalid entry, it will not add If add_role_user_mapping detects an invalid entry, it will not add
the mapping into the ACL_USER::role_grants array. the mapping into the ACL_USER::role_grants array.
*/ */
DBUG_ASSERT(add_role_user_mapping(mapping)); DBUG_ASSERT(status == 0);
} }
DBUG_VOID_RETURN;
} }
/* Return true if there is no users that can match the given host */ /* Return true if there is no users that can match the given host */