Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  dipika.(none):/opt/local/work/mysql-5.1-runtime


include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_binlog.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

1 files changed, 7 insertions, 1 deletions

diff --git a/sql-common/my_user.c b/sql-common/my_user.c
index 16a544387ee..d6f2818ad77 100644
--- a/sql-common/my_user.c
+++ b/sql-common/my_user.c
@@ -15,7 +15,7 @@
 
 #include <my_user.h>
 #include <m_string.h>
-
+#include <mysql_com.h>
 
 /*
   Parse user value to user name and host name parts.
@@ -47,6 +47,12 @@ void parse_user(const char *user_id_str, size_t user_id_len,
     *user_name_len= p - user_id_str;
     *host_name_len= user_id_len - *user_name_len - 1;
 
+    if (*user_name_len > USERNAME_LENGTH)
+      *user_name_len= USERNAME_LENGTH;
+
+    if (*host_name_len > HOSTNAME_LENGTH)
+      *host_name_len= HOSTNAME_LENGTH;
+
     memcpy(user_name_str, user_id_str, *user_name_len);
     memcpy(host_name_str, p + 1, *host_name_len);
   }