Commit 94b0713c authored by hf@deer.(none)'s avatar hf@deer.(none)

bugfix to #1224

code slightly modified with Monty's suggestions
parent 0f5933e3
...@@ -484,7 +484,7 @@ int check_embedded_connection(MYSQL *mysql) ...@@ -484,7 +484,7 @@ int check_embedded_connection(MYSQL *mysql)
THD *thd= (THD*)mysql->thd; THD *thd= (THD*)mysql->thd;
thd->host= (char*)my_localhost; thd->host= (char*)my_localhost;
thd->host_or_ip= thd->host; thd->host_or_ip= thd->host;
thd->user= mysql->user; thd->user= my_strdup(mysql->user, MYF(0));
return 0; return 0;
} }
...@@ -498,8 +498,8 @@ int check_embedded_connection(MYSQL *mysql) ...@@ -498,8 +498,8 @@ int check_embedded_connection(MYSQL *mysql)
if (mysql->options.client_ip) if (mysql->options.client_ip)
{ {
thd->host= mysql->options.client_ip; thd->host= my_strdup(mysql->options.client_ip, MYF(0));
thd->ip= thd->host; thd->ip= my_strdup(thd->host, MYF(0));
} }
else else
thd->host= (char*)my_localhost; thd->host= (char*)my_localhost;
...@@ -511,7 +511,7 @@ int check_embedded_connection(MYSQL *mysql) ...@@ -511,7 +511,7 @@ int check_embedded_connection(MYSQL *mysql)
goto err; goto err;
} }
thd->user= mysql->user; thd->user= my_strdup(mysql->user, MYF(0));
if (mysql->passwd && mysql->passwd[0]) if (mysql->passwd && mysql->passwd[0])
{ {
memset(thd->scramble, 55, SCRAMBLE_LENGTH); // dummy scramble memset(thd->scramble, 55, SCRAMBLE_LENGTH); // dummy scramble
......
...@@ -323,13 +323,11 @@ THD::~THD() ...@@ -323,13 +323,11 @@ THD::~THD()
#endif #endif
DBUG_PRINT("info", ("freeing host")); DBUG_PRINT("info", ("freeing host"));
#ifndef EMBEDDED_LIBRARY
if (host != my_localhost) // If not pointer to constant if (host != my_localhost) // If not pointer to constant
safeFree(host); safeFree(host);
if (user != delayed_user) if (user != delayed_user)
safeFree(user); safeFree(user);
safeFree(ip); safeFree(ip);
#endif
safeFree(db); safeFree(db);
free_root(&warn_root,MYF(0)); free_root(&warn_root,MYF(0));
free_root(&transaction.mem_root,MYF(0)); free_root(&transaction.mem_root,MYF(0));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment