bk commit into 5.0 tree (tsmith:1.2229)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-23 15:46:57-06:00, tsmith@stripped +2 -0
  Manual merge
  MERGE: 1.1616.2670.7

  sql/slave.cc@stripped, 2006-08-23 15:39:05-06:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.188.1.92

  sql/sql_acl.cc@stripped, 2006-08-23 15:46:54-06:00, tsmith@stripped +0 -2
    Manual merge
    MERGE: 1.74.32.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/b20536-50/RESYNC

--- 1.274/sql/slave.cc	2006-08-23 15:47:04 -06:00
+++ 1.275/sql/slave.cc	2006-08-23 15:47:04 -06:00
@@ -3226,7 +3226,7 @@ static int exec_relay_log_event(THD* thd
       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

--- 1.199/sql/sql_acl.cc	2006-08-23 15:47:04 -06:00
+++ 1.200/sql/sql_acl.cc	2006-08-23 15:47:04 -06:00
@@ -5413,8 +5413,6 @@ bool mysql_revoke_all(THD *thd,  List <L
     }  
     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;
     }