summaryrefslogtreecommitdiff
path: root/extra/comp_err.c
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2006-01-16 17:23:39 +0100
committerunknown <joerg@mysql.com>2006-01-16 17:23:39 +0100
commitdb5fe0fc9772d9ab74d12d735cb67ca2fcb8721d (patch)
tree37f3f65d7de889840cbf11e38abab45ac3ad4a30 /extra/comp_err.c
parent111cacfc7f02bfd6f497823c659356e1e1456904 (diff)
downloadmariadb-git-db5fe0fc9772d9ab74d12d735cb67ca2fcb8721d.tar.gz
extra/comp_err.c : Fix a merge error.
extra/comp_err.c: Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).
Diffstat (limited to 'extra/comp_err.c')
-rw-r--r--extra/comp_err.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c
index 1083d029f4e..65fc131a5fc 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -542,6 +542,7 @@ static char *parse_default_language(char *str)
fprintf(stderr,
"Unexpected EOL: No short language name after the keyword\n");
DBUG_RETURN(0);
+ }
/* reading the short language tag */
if (!(slang= get_word(&str)))
@@ -877,7 +878,7 @@ static void usage(void)
print_version();
printf("This software comes with ABSOLUTELY NO WARRANTY. "
"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");
my_print_help(my_long_options);
my_print_variables(my_long_options);