summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extra/comp_err.c8
-rw-r--r--scripts/mysqld_multi.sh3
2 files changed, 4 insertions, 7 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;
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index b2b85018d7a..2dcc8dc7bc4 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -763,9 +763,6 @@ sub usage
print <<EOF;
$my_progname version $VER by Jani Tolonen
-This software comes with ABSOLUTELY NO WARRANTY. This is free software,
-and you are welcome to modify and redistribute it under the GPL license.
-
Description:
$my_progname can be used to start, or stop any number of separate
mysqld processes running in different TCP/IP ports and UNIX sockets.