diff options
| author | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-07-02 11:58:39 +0530 |
|---|---|---|
| committer | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-07-02 11:58:39 +0530 |
| commit | e879caf845f3f1209eb2065fc4463a293ad9518c (patch) | |
| tree | e923a916e758c6cde635765b285649506d0fe00a /libmysqld/lib_sql.cc | |
| parent | 8723f47391d00fcdac268f276b76047058543706 (diff) | |
| download | mariadb-git-e879caf845f3f1209eb2065fc4463a293ad9518c.tar.gz | |
WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7
Backporting wl6715 to mysql-5.5
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2de7217f10b..36dd07159cc 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -699,7 +699,8 @@ int check_embedded_connection(MYSQL *mysql, const char *db) thd_init_client_charset(thd, mysql->charset->number); thd->update_charset(); Security_context *sctx= thd->security_ctx; - sctx->host_or_ip= sctx->host= (char*) my_localhost; + sctx->set_phost(my_localhost); + sctx->host_or_ip= sctx->get_host()->ptr(); strmake(sctx->priv_host, (char*) my_localhost, MAX_HOSTNAME-1); strmake(sctx->priv_user, mysql->user, USERNAME_LENGTH-1); sctx->user= my_strdup(mysql->user, MYF(0)); @@ -727,14 +728,14 @@ int check_embedded_connection(MYSQL *mysql, const char *db) if (mysql->options.client_ip) { - sctx->host= my_strdup(mysql->options.client_ip, MYF(0)); - sctx->ip= my_strdup(sctx->host, MYF(0)); + sctx->set_host(my_strdup(mysql->options.client_ip, MYF(0))); + sctx->set_ip(my_strdup(sctx->host()->ptr(), MYF(0))); } else - sctx->host= (char*)my_localhost; - sctx->host_or_ip= sctx->host; + sctx->set_host((char*)my_localhost); + sctx->host_or_ip= sctx->host->ptr(); - if (acl_check_host(sctx->host, sctx->ip)) + if (acl_check_host(sctx->get_host()->ptr(), sctx->get_ip()->ptr())) goto err; /* construct a COM_CHANGE_USER packet */ |