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

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into deer.(none):/home/hf/work/mysql-4.1.1224
This commit is contained in:
hf@deer.(none)
2004-01-27 13:48:20 +04:00
parent 1edab55f32 94b0713ca1
commit 631dc30c5a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmysqld/lib_sql.cc
View File

@ -484,7 +484,7 @@ int check_embedded_connection(MYSQL *mysql)
THD *thd= (THD*)mysql->thd;
thd->host= (char*)my_localhost;
thd->host_or_ip= thd->host;
thd->user= mysql->user;
thd->user= my_strdup(mysql->user, MYF(0));
return 0;
}
@ -498,8 +498,8 @@ int check_embedded_connection(MYSQL *mysql)
if (mysql->options.client_ip)
{
thd->host= mysql->options.client_ip;
thd->ip= thd->host;
thd->host= my_strdup(mysql->options.client_ip, MYF(0));
thd->ip= my_strdup(thd->host, MYF(0));
}
else
thd->host= (char*)my_localhost;
@ -511,7 +511,7 @@ int check_embedded_connection(MYSQL *mysql)
goto err;
}
thd->user= mysql->user;
thd->user= my_strdup(mysql->user, MYF(0));
if (mysql->passwd && mysql->passwd[0])
{
memset(thd->scramble, 55, SCRAMBLE_LENGTH); // dummy scramble