diff options
| author | unknown <joerg@mysql.com> | 2006-01-16 16:48:05 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-01-16 16:48:05 +0100 |
| commit | 111cacfc7f02bfd6f497823c659356e1e1456904 (patch) | |
| tree | 18ecbadcac525affbb9ce99ea767d72d79eef286 /extra/comp_err.c | |
| parent | 6bbc50cd857edf7aa1724dbae38c58fb357eb7ef (diff) | |
| parent | ddab016fc46cfbd175fff5b3a5a27f371afad012 (diff) | |
| download | mariadb-git-111cacfc7f02bfd6f497823c659356e1e1456904.tar.gz | |
Manual merge of the fix for bug#16106.
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
scripts/mysqld_multi.sh:
Auto merged
extra/comp_err.c:
Manual merge: From 4.1 to 5.0, the license line was moved to a different place.
Diffstat (limited to 'extra/comp_err.c')
| -rw-r--r-- | extra/comp_err.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index d0e387dcd35..1083d029f4e 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -542,7 +542,6 @@ 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))) @@ -876,9 +875,10 @@ static void usage(void) { DBUG_ENTER("usage"); print_version(); - printf("This software comes with ABSOLUTELY NO WARRANTY. This is free " - "software,\nand you are welcome to modify and redistribute it under " - "the GPL license\nUsage:\n"); + 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" + "Usage:\n"); my_print_help(my_long_options); my_print_variables(my_long_options); DBUG_VOID_RETURN; |