mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-build
This commit is contained in:
commit
d5b7909448
1 changed files with 4 additions and 4 deletions
|
@ -3633,10 +3633,10 @@ unsent_create_error:
|
||||||
while ((user=user_list++))
|
while ((user=user_list++))
|
||||||
{
|
{
|
||||||
if (user->password.str &&
|
if (user->password.str &&
|
||||||
strcmp(thd->user, user->user.str) ||
|
(strcmp(thd->user, user->user.str) ||
|
||||||
user->host.str &&
|
user->host.str &&
|
||||||
my_strcasecmp(system_charset_info,
|
my_strcasecmp(system_charset_info,
|
||||||
user->host.str, thd->host_or_ip))
|
user->host.str, thd->host_or_ip)))
|
||||||
{
|
{
|
||||||
if (check_access(thd, UPDATE_ACL, "mysql", 0, 1, 0))
|
if (check_access(thd, UPDATE_ACL, "mysql", 0, 1, 0))
|
||||||
goto error;
|
goto error;
|
||||||
|
|
Loading…
Reference in a new issue