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

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged

1 files changed, 4 insertions, 4 deletions

diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc
index 48cce142db6..832a8cee6b9 100644
--- a/server-tools/instance-manager/user_map.cc
+++ b/server-tools/instance-manager/user_map.cc
@@ -24,8 +24,8 @@
 
 User::User(const LEX_STRING *user_name_arg, const char *password)
 {
-  user_length= strmake(user, user_name_arg->str, USERNAME_LENGTH + 1) - user;
-
+  user_length= (uint8) (strmake(user, user_name_arg->str,
+                                USERNAME_LENGTH + 1) - user);
   set_password(password);
 }
 
@@ -59,7 +59,7 @@ int User::init(const char *line)
     password= name_end + 1;
   }
 
-  user_length= name_end - name_begin;
+  user_length= (uint8) (name_end - name_begin);
   if (user_length > USERNAME_LENGTH)
   {
     log_error("User name is too long (%d). Max length: %d. "
@@ -70,7 +70,7 @@ int User::init(const char *line)
     return 1;
   }
 
-  password_length= strlen(password);
+  password_length= (int) strlen(password);
   if (password_length > SCRAMBLED_PASSWORD_CHAR_LENGTH)
   {
     log_error("Password is too long (%d). Max length: %d."