1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

postmerge fixes

libmysqld/lib_sql.cc:
  struct st_security_context nad to class Security_context
sql/item_func.cc:
  fixed method call, name and contence to be compatible with new code
sql/item_func.h:
  fixed method to be compatible wit new code
sql/sql_parse.cc:
  fixed typo
  removed compiler warnings
This commit is contained in:
unknown
2005-09-21 08:29:47 +03:00
parent aa95f0d447
commit 21a62eb1c6
4 changed files with 36 additions and 49 deletions

View File

@@ -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);