summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-30 05:47:33 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-30 05:47:33 +0300
commit1134f794d02ff93b97fa77c7b506e4e49458a0e0 (patch)
tree0582cae1e998f68646afadd54d447b29857a843c /libmysqld
parent097f690276abd66881f80fe1fd39824b6a7dd4de (diff)
parent6e8704ee0993b4f06d1c3626291346d20c6d60cb (diff)
downloadmariadb-git-1134f794d02ff93b97fa77c7b506e4e49458a0e0.tar.gz
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index e7da577ab0c..116219372fd 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -257,7 +257,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
send_error(net,ER_OUT_OF_RESOURCES);
return 1;
}
- thd->master_access=acl_getroot(thd->host, thd->ip, thd->user,
+ thd->master_access=acl_getroot(thd, thd->host, thd->ip, thd->user,
passwd, thd->scramble, &thd->priv_user,
protocol_version == 9 ||
!(thd->client_capabilities &