database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Cleanup: manually port the polishing parts from Alik's changeset for

Browse Source 
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned
This commit is contained in:
kostja@bodhi.local
2006-11-16 23:36:20 +03:00
parent e8d51e62bb
commit 2f69dfb28f
21 changed files with 205 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server-tools/instance-manager/user_map.cc
View File

@ -42,7 +42,7 @@ int User::init(const char *line)
if (name_end == 0 || name_end[1] != ':')
{
log_info("Error: invalid format (unmatched quote) of user line (%s).",
(const char *) line);
(const char *) line);
return 1;
}
password= name_end + 2;
@ -54,7 +54,7 @@ int User::init(const char *line)
if (name_end == 0)
{
log_info("Error: invalid format (no delimiter) of user line (%s).",
(const char *) line);
(const char *) line);
return 1;
}
password= name_end + 1;
@ -64,17 +64,18 @@ int User::init(const char *line)
if (user_length > USERNAME_LENGTH)
{
log_info("Error: user name is too long (%d). Max length: %d. "
"User line: '%s'.",
(int) user_length,
(int) USERNAME_LENGTH,
(const char *) line);
"User line: '%s'.",
(int) user_length,
(int) USERNAME_LENGTH,
(const char *) line);
return 1;
}
password_length= strlen(password);
if (password_length > SCRAMBLED_PASSWORD_CHAR_LENGTH)
{
log_info("Error: password is too long (%d). Max length: %d. User line: '%s'.",
log_info("Error: password is too long (%d). Max length: %d."
"User line: '%s'.",
(int) password_length,
(int) SCRAMBLED_PASSWORD_CHAR_LENGTH,
line);