Commit c744e274 authored by unknown's avatar unknown
Browse files

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:
  removed extra parameters used in sql_print_warning
  added code to output "" when host.db is null in the top sql_print_warning call
parent 6474d274

sql/sql_acl.cc

+4 −4
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) 
    {

      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 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) 
    {

      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 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) 
    {

      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 @@ my_bool grant_init(THD *org_thd) 
        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;

      }

    }