Commit 01d4f47e authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru Committed by Sergei Golubchik

Added GRANT privilege ON database.* TO role; functionality

parent dcc9fd4c
...@@ -3256,8 +3256,12 @@ static int replace_db_table(TABLE *table, const char *db, ...@@ -3256,8 +3256,12 @@ static int replace_db_table(TABLE *table, const char *db,
/* Check if there is such a user in user table in memory? */ /* Check if there is such a user in user table in memory? */
if (!find_user_no_anon(combo.host.str,combo.user.str, FALSE)) if (!find_user_no_anon(combo.host.str,combo.user.str, FALSE))
{ {
my_message(ER_PASSWORD_NO_MATCH, ER(ER_PASSWORD_NO_MATCH), MYF(0)); /* The user could be a role, check if the user is registered as a role */
DBUG_RETURN(-1); if (!combo.host.length && !find_acl_role(combo.user.str))
{
my_message(ER_PASSWORD_NO_MATCH, ER(ER_PASSWORD_NO_MATCH), MYF(0));
DBUG_RETURN(-1);
}
} }
table->use_all_columns(); table->use_all_columns();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment