summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-07-18 04:38:05 +0300
committerunknown <monty@narttu.mysql.fi>2003-07-18 04:38:05 +0300
commit4fa18bba64597e19895128bcd05fd2c0a34e0f99 (patch)
tree27e22df6ddfa1f1369b4dd50c98a868abd8c225a /sql
parentf2b39370468426b21337dd8e9372361ef83614e4 (diff)
parent730507ffda78de6e29ce394a88afe7011a40919d (diff)
downloadmariadb-git-4fa18bba64597e19895128bcd05fd2c0a34e0f99.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_acl.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 697b5d8ffd6..d773aa5bc71 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1136,7 +1136,11 @@ find_acl_user(const char *host, const char *user)
{
ACL_USER *acl_user=dynamic_element(&acl_users,i,ACL_USER*);
DBUG_PRINT("info",("strcmp('%s','%s'), compare_hostname('%s','%s'),",
- user,acl_user->user,(host),(acl_user->host)));
+ user,
+ acl_user->user ? acl_user->user : "",
+ host,
+ acl_user->host.hostname ? acl_user->host.hostname :
+ ""));
if (!acl_user->user && !user[0] ||
acl_user->user && !strcmp(user,acl_user->user))
{