Commit 07369d5a authored by unknown's avatar unknown
Browse files

Manual merge 


sql/slave.cc:
  Auto merged
parents 0cb3d26d 216f20ad

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -3226,7 +3226,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) 
      rli->is_until_satisfied())

  {

    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));

    /*

      Setting abort_slave flag because we do not want additional message about

sql/sql_acl.cc

+0 −2
Original line number Diff line number Diff line
@@ -5413,8 +5413,6 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list) 
    }  

    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;

      continue;

    }