mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
extra/comp_err.c : Fix a merge error.
extra/comp_err.c: Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).
This commit is contained in:
@@ -542,6 +542,7 @@ static char *parse_default_language(char *str)
|
|||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"Unexpected EOL: No short language name after the keyword\n");
|
"Unexpected EOL: No short language name after the keyword\n");
|
||||||
DBUG_RETURN(0);
|
DBUG_RETURN(0);
|
||||||
|
}
|
||||||
|
|
||||||
/* reading the short language tag */
|
/* reading the short language tag */
|
||||||
if (!(slang= get_word(&str)))
|
if (!(slang= get_word(&str)))
|
||||||
@@ -877,7 +878,7 @@ static void usage(void)
|
|||||||
print_version();
|
print_version();
|
||||||
printf("This software comes with ABSOLUTELY NO WARRANTY. "
|
printf("This software comes with ABSOLUTELY NO WARRANTY. "
|
||||||
"This is free software,\n"
|
"This is free software,\n"
|
||||||
"and you are welcome to modify and redistribute it under the GPL license.\n"
|
"and you are welcome to modify and redistribute it under the GPL license.\n"
|
||||||
"Usage:\n");
|
"Usage:\n");
|
||||||
my_print_help(my_long_options);
|
my_print_help(my_long_options);
|
||||||
my_print_variables(my_long_options);
|
my_print_variables(my_long_options);
|
||||||
|
Reference in New Issue
Block a user