diff options
| author | unknown <hf@deer.(none)> | 2004-01-27 13:48:20 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-27 13:48:20 +0400 |
| commit | c6ca96ade99be1827ea17a46cdb5c88e4632746c (patch) | |
| tree | a8d8a938b9621e1179d76ed8d5fd146e2d1454e8 /libmysqld | |
| parent | 36ab3e0dfef031b0c69fa6f7050bec2111b3c987 (diff) | |
| parent | 58e442caf3740ef27e9349e9a50954ecbfd679ce (diff) | |
| download | mariadb-git-c6ca96ade99be1827ea17a46cdb5c88e4632746c.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.1224
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2d451d6cecd..741916064b0 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -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 |