diff options
author | unknown <hf@deer.mysql.r18.ru> | 2002-12-16 18:58:55 +0400 |
---|---|---|
committer | unknown <hf@deer.mysql.r18.ru> | 2002-12-16 18:58:55 +0400 |
commit | 8db300257b8e457f63a61d27c16ffeb4e23127b1 (patch) | |
tree | 84a5d074a9241cebc5ac2f73a883ad6765c39100 /sql/item_strfunc.cc | |
parent | fce29f66fb95c1742f3a80c67ad92d21f1cc1544 (diff) | |
parent | 632717fd8d70ff187621df8a0839678ceae19ab5 (diff) | |
download | mariadb-git-8db300257b8e457f63a61d27c16ffeb4e23127b1.tar.gz |
Merging
BitKeeper/etc/logging_ok:
auto-union
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 473c4538ab1..7dcab11912e 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1394,6 +1394,11 @@ 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; @@ -1401,6 +1406,7 @@ 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; } |