summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSinisa@sinisa.nasamreza.org <>2003-04-09 17:34:06 +0300
committerSinisa@sinisa.nasamreza.org <>2003-04-09 17:34:06 +0300
commit5ca7b274fe61896c3866a5fff2b69b5dd8183c3a (patch)
tree4d43d43bfbd60256cb2c8af8891abb35706bab11 /sql
parentf79cabdc8fb23ae649c889c3bca986f3fec5797a (diff)
downloadmariadb-git-5ca7b274fe61896c3866a5fff2b69b5dd8183c3a.tar.gz
fix for a :
SELECT USER();
Diffstat (limited to 'sql')
-rw-r--r--sql/item_strfunc.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 45a7625b331..aff66ef150b 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1461,7 +1461,8 @@ String *Item_func_user::val_str(String *str)
// 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;
+ uint32 res_length=(strlen(thd->user)+strlen(host)+3) * cs->mbmaxlen;
+// it is +3 , because 1 for each string and 1 for '@' sign
if (str->alloc(res_length))
{