diff options
| author | unknown <brian@brian-akers-computer.local> | 2005-06-09 13:11:54 -0700 |
|---|---|---|
| committer | unknown <brian@brian-akers-computer.local> | 2005-06-09 13:11:54 -0700 |
| commit | 9fc802086618c6ad9ed5fa8bbd395c0ee5a9ea31 (patch) | |
| tree | 0f14129cf4732dc6b631ce5b3fce6e08b4824344 /sql/sql_acl.cc | |
| parent | 16b6ced0c7b6a0f52033063fa19415350c6466e2 (diff) | |
| parent | 6809ceb71817ffa3091b6f94fec0de259b13c999 (diff) | |
| download | mariadb-git-9fc802086618c6ad9ed5fa8bbd395c0ee5a9ea31.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 755437b18c3..04da0dd5eb5 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -188,7 +188,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) { /* convert db to lower case and give a warning if the db wasn't @@ -210,7 +210,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 @@ -278,7 +278,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; } @@ -414,7 +414,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); @@ -3232,7 +3232,7 @@ my_bool grant_init(THD *org_thd) sql_print_warning("'procs_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; } } |