diff options
author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-27 19:31:49 +0200 |
---|---|---|
committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-27 19:31:49 +0200 |
commit | 3956f5911e86bb9610f502832f5103530053e7ec (patch) | |
tree | d28a6d1f930596f828c5f26824d51b1c917abe91 /server-tools/instance-manager | |
parent | 175507b766c471d7545165857debc0cd55d04422 (diff) | |
download | mariadb-git-3956f5911e86bb9610f502832f5103530053e7ec.tar.gz |
Remove compiler warnings
mysql-test/mysql-test-run.pl:
Fix warning when using --extern
sql/field.cc:
Fix wrong fix
sql/ha_ndbcluster.cc:
Better fixes to remove compiler warnings
sql/ha_ndbcluster_binlog.cc:
Better fixes to remove compiler warnings
sql/log.cc:
Fix compiler warnings
sql/sql_parse.cc:
Indentation fix
sql/sql_table.cc:
Indentation fixes
storage/myisammrg/ha_myisammrg.cc:
Fix compiler warnings
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fix compiler warnings
support-files/compiler_warnings.supp:
Suppress all 'safe' warnings, as detected by win64
win/README:
Fixed typo
Diffstat (limited to 'server-tools/instance-manager')
-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." |