database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug #20402: DROP USER failure logged as ERROR rather than WARNING

Browse Source 
Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).

Also, convert an sql_print_error -> sql_print_information for a non-error server event.
This commit is contained in:
tsmith/tim@siva.hindu.god
2006-08-23 15:37:54 -06:00
parent 72d55f3878
commit dba7b8e81c
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/slave.cc
View File

@ -2946,7 +2946,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli)
rli->is_until_satisfied()) rli->is_until_satisfied())
{ {
char buf[22]; char buf[22];
sql_print_error("Slave SQL thread stopped because it reached its" sql_print_information("Slave SQL thread stopped because it reached its"
" UNTIL position %s", llstr(rli->until_pos(), buf)); " UNTIL position %s", llstr(rli->until_pos(), buf));
/* /*
Setting abort_slave flag because we do not want additional message about Setting abort_slave flag because we do not want additional message about

15
sql/sql_acl.cc
View File

@ -3669,17 +3669,11 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list)
{ {
if (!(acl_user= check_acl_user(user_name, &counter))) if (!(acl_user= check_acl_user(user_name, &counter)))
{ {
sql_print_error("DROP USER: Can't drop user: '%s'@'%s'; No such user",
user_name->user.str,
user_name->host.str);
result= -1; result= -1;
continue; continue;
} }
if ((acl_user->access & ~0)) if ((acl_user->access & ~0))
{ {
sql_print_error("DROP USER: Can't drop user: '%s'@'%s'; Global privileges exists",
user_name->user.str,
user_name->host.str);
result= -1; result= -1;
continue; continue;
} }
@ -3700,9 +3694,6 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list)
} }
if (counter != acl_dbs.elements) if (counter != acl_dbs.elements)
{ {
sql_print_error("DROP USER: Can't drop user: '%s'@'%s'; Database privileges exists",
user_name->user.str,
user_name->host.str);
result= -1; result= -1;
continue; continue;
} }
@ -3723,9 +3714,6 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list)
} }
if (counter != column_priv_hash.records) if (counter != column_priv_hash.records)
{ {
sql_print_error("DROP USER: Can't drop user: '%s'@'%s'; Table privileges exists",
user_name->user.str,
user_name->host.str);
result= -1; result= -1;
continue; continue;
} }
@ -3791,9 +3779,6 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
{ {
if (!check_acl_user(lex_user, &counter)) if (!check_acl_user(lex_user, &counter))
{ {
sql_print_error("REVOKE ALL PRIVILEGES, GRANT: User '%s'@'%s' not exists",
lex_user->user.str,
lex_user->host.str);
result= -1; result= -1;
continue; continue;
} }