bk commit into 4.1 tree (reggie:1.2305) BUG#10181

[reggie]

Below is the list of changes that have just been committed into a local
4.1 repository of reggie. When reggie 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
  1.2305 05/05/31 07:21:10 reggie@mdk10.(none) +1 -0
  BUG# 10181-mysqld.exe crash with an access vioation after INSERT INTO mysql.host
  
  this is a followup cset after changes suggested by Serg.

  sql/sql_acl.cc
    1.164 05/05/31 07:21:03 reggie@mdk10.(none) +4 -4
    removed extra parameters used in sql_print_warning
    added code to output "" when host.db is null in the top sql_print_warning call

# 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:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/41test3

--- 1.163/sql/sql_acl.cc	2005-05-26 14:01:18 -05:00
+++ 1.164/sql/sql_acl.cc	2005-05-31 07:21:03 -05:00
@@ -222,7 +222,7 @@
     {
       sql_print_warning("'host' entry '%s|%s' "
 		      "ignored in --skip-name-resolve mode.",
-		      host.host.hostname, host.db, host.host.hostname);
+		      host.host.hostname, host.db?host.db:"");
       continue;
     }
 #ifndef TO_BE_REMOVED
@@ -290,7 +290,7 @@
     {
       sql_print_warning("'user' entry '%s@%s' "
                         "ignored in --skip-name-resolve mode.",
-		      user.user, user.host.hostname, user.host.hostname);
+		      user.user, user.host.hostname);
       continue;
     }
 
@@ -393,7 +393,7 @@
     {
       sql_print_warning("'db' entry '%s %s@%s' "
 		        "ignored in --skip-name-resolve mode.",
-		        db.db, db.user, db.host.hostname, db.host.hostname);
+		        db.db, db.user, db.host.hostname);
       continue;
     }
     db.access=get_access(table,3);
@@ -2690,7 +2690,7 @@
         sql_print_warning("'tables_priv' entry '%s %s@%s' "
                           "ignored in --skip-name-resolve mode.",
                           mem_check->tname, mem_check->user,
-                          mem_check->host, mem_check->host);
+                          mem_check->host);
 	continue;
       }
     }