diff options
| author | unknown <serg@serg.mylan> | 2003-10-25 00:03:44 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-25 00:03:44 +0200 |
| commit | 85d3e02e2e2bdee08252b898c2ff66f81d4f3958 (patch) | |
| tree | d629b741c92a4e3b454dd11651a76a12d35b793f /sql/sql_acl.cc | |
| parent | d8d642314cce9d0e9ea766a9d584529da6e59f18 (diff) | |
| parent | 4e5f086b59a07914c9484c10cc74788858a3cc0b (diff) | |
| download | mariadb-git-85d3e02e2e2bdee08252b898c2ff66f81d4f3958.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index b8423fc6b7a..b54e6a95bc5 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3545,8 +3545,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); + + /* 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)); + DBUG_RETURN(result); } |