diff options
| author | unknown <joerg@mysql.com> | 2006-01-13 16:25:20 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-01-13 16:25:20 +0100 |
| commit | de4a3552e111596800da8db55276a0a9bbe07a1a (patch) | |
| tree | d43b7aa0ae6b11e6dfcdfddad4b749966bdddde1 | |
| parent | 2946f9a64f664293010777e422e7b66058ce323a (diff) | |
| download | mariadb-git-de4a3552e111596800da8db55276a0a9bbe07a1a.tar.gz | |
extra/comp_err.c + scripts/mysqld_multi.sh :
Copyright string fixes (bug#16106)
extra/comp_err.c:
Ensure that the license spelling is as expected by the "mysql_copyright" tool.
(bug#16106)
scripts/mysqld_multi.sh:
The "mysql_copyright" tool will not change non-C files, so do not mention the license.
(bug#16106)
| -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 bd7e6231908..e627a47b21f 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -137,7 +137,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 b75aa1a7c31..21439650ef3 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -624,9 +624,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. |