Commit 545ea4bf authored by unknown's avatar unknown

Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-51

into  siva.hindu.god:/usr/home/tim/m/bk/51


sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
parents 1152f809 beceb8f4
...@@ -5609,8 +5609,6 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list) ...@@ -5609,8 +5609,6 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list)
} }
if (!find_acl_user(lex_user->host.str, lex_user->user.str, TRUE)) if (!find_acl_user(lex_user->host.str, lex_user->user.str, TRUE))
{ {
sql_print_error("REVOKE ALL PRIVILEGES, GRANT: User '%s'@'%s' does not "
"exists", lex_user->user.str, lex_user->host.str);
result= -1; result= -1;
continue; continue;
} }
......
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