database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  siva.hindu.god:/usr/home/tim/m/bk/b20536-51
This commit is contained in:
tsmith/tim@siva.hindu.god
2006-08-23 16:03:57 -06:00
parent c2f4e56940 0831d404e1
commit cf5f2693f2
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/slave.cc
View File

@ -3051,7 +3051,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

2
sql/sql_acl.cc
View File

@ -5560,8 +5560,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;
} }