Added GRANT privilege ON database.table TO role; functionality

3d17d94c · Vicențiu Ciorbaru · Sergei Golubchik · 01d4f47e · 3d17d94c
Commit 3d17d94c authored Oct 18, 2013 by Vicențiu Ciorbaru Committed by Sergei Golubchik Oct 18, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

sql/sql_acl.cc sql/sql_acl.cc +6 -3

No files found.
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -4042,9 +4042,12 @@ static int replace_table_table(THD *thd, GRANT_TABLE *grant_table,
  */
  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));	/* purecov: deadcode */
-    DBUG_RETURN(-1);				/* purecov: deadcode */
+    if (!combo.host.length && !find_acl_role(combo.user.str))
+    {
+      my_message(ER_PASSWORD_NO_MATCH, ER(ER_PASSWORD_NO_MATCH),
+                 MYF(0)); /* purecov: deadcode */
+      DBUG_RETURN(-1);                            /* purecov: deadcode */
+    }
  }

  table->use_all_columns();