1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge bk-internal:/home/bk/mysql-4.1-maint

into  rama.(none):/home/jimw/my/mysql-4.1-clean
This commit is contained in:
jimw@rama.(none)
2006-09-28 18:11:29 -07:00
14 changed files with 64 additions and 38 deletions

View File

@@ -426,7 +426,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
"case that has been forced to lowercase because "
"lower_case_table_names is set. It will not be "
"possible to remove this privilege using REVOKE.",
db.db, db.user, db.host.hostname, db.host.hostname);
db.db, db.user, db.host.hostname);
}
}
db.sort=get_sort(3,db.host.hostname,db.db,db.user);
@@ -2778,7 +2778,7 @@ static my_bool grant_load(TABLE_LIST *tables)
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.hostname);
continue;
}
}