summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2005-09-21 08:29:47 +0300
committerbell@sanja.is.com.ua <>2005-09-21 08:29:47 +0300
commit506c6eb922730e0cb465f91d51f3fc96c6fe9f0a (patch)
tree3fd9549289ca85690f0fe0b1fc7427e8c2394642 /libmysqld
parent3f66053a50ff2f4c9edabe412c48f3359a13dfbd (diff)
downloadmariadb-git-506c6eb922730e0cb465f91d51f3fc96c6fe9f0a.tar.gz
postmerge fixes
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 d6f41fda5f6..99761ceb8c7 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -532,7 +532,7 @@ err:
int check_embedded_connection(MYSQL *mysql)
{
THD *thd= (THD*)mysql->thd;
- st_security_context *sctx= thd->security_ctx;
+ Security_context *sctx= thd->security_ctx;
sctx->host_or_ip= sctx->host= (char*)my_localhost;
sctx->priv_user= sctx->user= my_strdup(mysql->user, MYF(0));
return check_user(thd, COM_CONNECT, NULL, 0, thd->db, true);