summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/user_map.cc
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2005-09-20 03:14:07 +0400
committerunknown <petr@mysql.com>2005-09-20 03:14:07 +0400
commitc8c29f2dc40fdbaeba704de524449d6358b8ce3a (patch)
treefd7480eac111f5c97d4eae8640cafc64527a7721 /server-tools/instance-manager/user_map.cc
parent730fc4156d9946a84c1a3e6a0cf37aded79a0c8d (diff)
downloadmariadb-git-c8c29f2dc40fdbaeba704de524449d6358b8ce3a.tar.gz
fix warnings
server-tools/instance-manager/buffer.cc: perform initialization of static consts in .cc file to respect VC6 server-tools/instance-manager/buffer.h: fix compiler warning server-tools/instance-manager/commands.cc: fix compiler warning server-tools/instance-manager/user_map.cc: fix compiler warning
Diffstat (limited to 'server-tools/instance-manager/user_map.cc')
-rw-r--r--server-tools/instance-manager/user_map.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc
index d13eb681d05..93c4a2ade25 100644
--- a/server-tools/instance-manager/user_map.cc
+++ b/server-tools/instance-manager/user_map.cc
@@ -66,7 +66,8 @@ int User::init(const char *line)
*/
if (password[strlen(password)-2] == '\r')
line_ending_len= 2;
- if (strlen(password) != SCRAMBLED_PASSWORD_CHAR_LENGTH + line_ending_len)
+ if (strlen(password) != (uint) (SCRAMBLED_PASSWORD_CHAR_LENGTH +
+ line_ending_len))
goto err;
memcpy(user, name_begin, user_length);