diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-09-21 08:29:47 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-09-21 08:29:47 +0300 |
| commit | 21a62eb1c6a281b72c24bb9a7d5af702a5b3d8d5 (patch) | |
| tree | 3fd9549289ca85690f0fe0b1fc7427e8c2394642 /libmysqld/lib_sql.cc | |
| parent | aa95f0d447ed43cb20f1ce3221334b8f75e82377 (diff) | |
| download | mariadb-git-21a62eb1c6a281b72c24bb9a7d5af702a5b3d8d5.tar.gz | |
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
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
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); |