diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-23 01:46:07 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-23 01:46:07 +0300 |
| commit | 762b3175c695b0dc1ae60858826d9879e63acb16 (patch) | |
| tree | 6655db49750fed1714c5d9932bd80d64cde2b0b0 /sql/item_strfunc.cc | |
| parent | 78b2c66bff15e22f810b3274c07af446ccd262a9 (diff) | |
| parent | ac02f54022f2a64ada230ef4a3f446b26b143275 (diff) | |
| download | mariadb-git-762b3175c695b0dc1ae60858826d9879e63acb16.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 56e3eb2cb5f..32913761301 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1457,11 +1457,13 @@ String *Item_func_user::val_str(String *str) { THD *thd=current_thd; CHARSET_INFO *cs= default_charset(); - const char *host=thd->host ? thd->host : thd->ip ? thd->ip : ""; + const char *host= thd->host_or_ip; + uint res_length; + // For system threads (e.g. replication SQL thread) user may be empty if (!thd->user) return &empty_string; - uint32 res_length=(strlen(thd->user)+strlen(host)+2) * cs->mbmaxlen; + res_length= (strlen(thd->user)+strlen(host)+2) * cs->mbmaxlen; if (str->alloc(res_length)) { |