Commit 31aad78f authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mdk10.(none):/home/reggie/bk/41test3


sql/sql_acl.cc:
  Auto merged
parents 2f7ee68d c744e274

sql/sql_acl.cc

+5 −5
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) 
    ACL_HOST host;

    update_hostname(&host.host,get_field(&mem, table->field[0]));

    host.db=	 get_field(&mem, table->field[1]);

    if (lower_case_table_names)

    if (lower_case_table_names && host.db)

    {

      /*

       We make a temporary copy of the database, force it to lower case,
@@ -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;

      }

    }