diff options
| author | joerg@mysql.com <> | 2006-01-18 10:44:00 +0100 |
|---|---|---|
| committer | joerg@mysql.com <> | 2006-01-18 10:44:00 +0100 |
| commit | 5e69a370c45bb77715d82b62ce5682c9d03bc828 (patch) | |
| tree | ef7537dc805ba9ae66dade77dbbf979b0830cfff | |
| parent | 87f685edef5bd97ab8099d0ae6dcf2fa3ddd871b (diff) | |
| parent | f4d4cc6e7bfcfbf6d1ebd4d2b2a4f573f91c1b60 (diff) | |
| download | mariadb-git-5e69a370c45bb77715d82b62ce5682c9d03bc828.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
| -rw-r--r-- | extra/comp_err.c | 7 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index d0e387dcd35..65fc131a5fc 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -876,9 +876,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. |