1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extra/comp_err.c : Fix a merge error.

Browse Source
This commit is contained in:
joerg@mysql.com 2006-01-16 17:23:39 +01:00
parent fa91e05bf5
commit 5da306b57e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extra/comp_err.c
View File

@ -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);