diff options
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index c83b0bcb651..0b9658a5c2a 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1394,11 +1394,6 @@ String *Item_func_user::val_str(String *str) const char *host=thd->host ? thd->host : thd->ip ? thd->ip : ""; uint32 res_length=(strlen(thd->user)+strlen(host)+10) * cs->mbmaxlen; -#ifdef EMBEDDED_LIBRARY - if (str->copy("localuser@localhost", (uint)strlen("localuser@localhost"), cs)) - return &empty_string; -#else - if (str->alloc(res_length)) { null_value=1; @@ -1406,7 +1401,6 @@ String *Item_func_user::val_str(String *str) } res_length=cs->snprintf(cs, (char*)str->ptr(), res_length, "%s@%s",thd->user,host); str->length(res_length); -#endif str->set_charset(cs); return str; } |