diff options
| author | unknown <hf@deer.(none)> | 2004-01-27 13:46:47 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-27 13:46:47 +0400 |
| commit | 58e442caf3740ef27e9349e9a50954ecbfd679ce (patch) | |
| tree | 6b057ed2cd82a6da7910f989cbadbd78ce2cf0bc /libmysqld | |
| parent | a5af8f1f808a46a958ff665e250b51acb3204693 (diff) | |
| download | mariadb-git-58e442caf3740ef27e9349e9a50954ecbfd679ce.tar.gz | |
bugfix to #1224
code slightly modified with Monty's suggestions
libmysqld/lib_sql.cc:
copying of pointers replaced with my_strdup()-s
sql/sql_class.cc:
this code should work anyway now
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 |