Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item_strfunc.cc:
  Auto merged

sql/item_strfunc.cc

@@ -1461,8 +1461,7 @@ 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)+3) * cs->mbmaxlen;
-// it is +3 , because 1 for each string and 1 for '@' sign
+  uint32       res_length=(strlen(thd->user)+strlen(host)+2) * cs->mbmaxlen;
 
   if (str->alloc(res_length))
   {