diff options
| -rw-r--r-- | sql/sql_acl.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 82450704ee0..1db544af64c 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3589,13 +3589,16 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list) VOID(pthread_mutex_unlock(&acl_cache->lock)); rw_unlock(&LOCK_grant); close_thread_tables(thd); -#ifdef TO_BE_DELETED - /* XXX this should not be necessary. The error message is already printed */ + + /* XXX this should not be necessary. The error message is already printed + by replace_xxx_table. my_error() should be use above instead of + sql_print_error(), and print ER_NONEXISTING_GRANT - as other grant + commands do */ /* when this code is deleted, the error slot (error 1268) can be reused, as this error code was not present in any MySQL release */ if (result) my_error(ER_REVOKE_GRANTS, MYF(0)); -#endif + DBUG_RETURN(result); } |