summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-08-14 20:33:49 +0300
committermonty@hundin.mysql.fi <>2001-08-14 20:33:49 +0300
commit59e7c97dabb4ec2b60b994be194e9764ec16fa00 (patch)
tree63b1bcf87d376e768395f4a058416187ee0aad95 /sql/sql_db.cc
parentcf19429793d1492af9c806132082e4f66b484fc1 (diff)
downloadmariadb-git-59e7c97dabb4ec2b60b994be194e9764ec16fa00.tar.gz
Remove warnings and portability fixes
New global read lock code Fixed bug in DATETIME with WHERE optimization Made UNION code more general.
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 85d3f0a344c..21d44d3b41d 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -348,11 +348,11 @@ bool mysql_change_db(THD *thd,const char *name)
{
net_printf(&thd->net,ER_DBACCESS_DENIED_ERROR,
thd->priv_user,
- thd->host ? thd->host : thd->ip ? thd->ip : "unknown",
+ thd->host_or_ip,
dbname);
mysql_log.write(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR),
thd->priv_user,
- thd->host ? thd->host : thd->ip ? thd->ip : "unknown",
+ thd->host_or_ip,
dbname);
my_free(dbname,MYF(0));
DBUG_RETURN(1);