database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

WL#7076: Backporting wl6715 to support both formats

Browse Source 
in 5.5, 5.6, 5.7.
This commit is contained in:
Ashish Agarwal
2013-08-23 09:07:09 +05:30
parent f7e0cc8204 f5b5e6b951
commit d75c58e11f
17 changed files with 295 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libmysqld/lib_sql.cc
View File

@ -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_host(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->get_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 */