summaryrefslogtreecommitdiff
path: root/libmysqld/lib_sql.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-04-29 15:12:25 +0200
committerunknown <serg@serg.mylan>2003-04-29 15:12:25 +0200
commitb725fc0b33a29775678671b613640109a4fe8f56 (patch)
treee4437ff73127fd4b6f0b8a4b928b7780d4fff0d8 /libmysqld/lib_sql.cc
parent3c9524233bf4cac12ebd2ac432f8ce4cfe1b5dbc (diff)
parent7e1b828a387c33bb36d10661a05d6c83d66d0c54 (diff)
downloadmariadb-git-b725fc0b33a29775678671b613640109a4fe8f56.tar.gz
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'libmysqld/lib_sql.cc')
-rw-r--r--libmysqld/lib_sql.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 641fd2bb2c1..4e85c29c2f2 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -225,7 +225,8 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
return 1;
}
thd->master_access=acl_getroot(thd, thd->host, thd->ip, thd->user,
- passwd, thd->scramble, &thd->priv_user,
+ passwd, thd->scramble,
+ &thd->priv_user, &thd->priv_host,
protocol_version == 9 ||
!(thd->client_capabilities &
CLIENT_LONG_PASSWORD),&ur);