diff options
| author | serg@janus.mylan <> | 2007-03-06 13:44:57 +0100 |
|---|---|---|
| committer | serg@janus.mylan <> | 2007-03-06 13:44:57 +0100 |
| commit | 6aa5c001c5debfedb044b4be455e0549de836409 (patch) | |
| tree | 6633aa27d1875e982ecf73b0f605752dcadbc94f /server-tools | |
| parent | 30321673a278025b40ee93b9b1c8e75f3dc89acb (diff) | |
| parent | 2baf35b4fab1cd1c185b7b98645eb76ed88d9f73 (diff) | |
| download | mariadb-git-6aa5c001c5debfedb044b4be455e0549de836409.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/user_map.cc | 8 |
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." |