diff options
| author | joerg@mysql.com <> | 2006-01-13 17:45:01 +0100 |
|---|---|---|
| committer | joerg@mysql.com <> | 2006-01-13 17:45:01 +0100 |
| commit | 1155bf20d93f8ae3e9ae68e6bcc055d261911a85 (patch) | |
| tree | 23c9a31c792e02950b5afeebe1f2ec1cb6e6c2ba | |
| parent | bccbc740c3f69cdf1d8d5a053a6010540da45065 (diff) | |
| parent | 9d4562e5fe6f3485bf8b0e34a04122538e5ab127 (diff) | |
| download | mariadb-git-1155bf20d93f8ae3e9ae68e6bcc055d261911a85.tar.gz | |
Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1
| -rw-r--r-- | extra/comp_err.c | 4 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index 6c7fad6a270..f47c8a1beca 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -159,7 +159,9 @@ static void get_options(register int *argc,register char **argv[]) case 'I': case '?': printf(" %s (Compile errormessage) Ver 1.3\n",progname); - puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n"); + puts("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"); printf("Usage: %s [-?] [-I] [-V] fromfile[s] tofile\n",progname); puts("Options: -Info -Version\n"); help=1; diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 7fff4cbb731..4a6f380494f 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -718,9 +718,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. |