Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1
This commit is contained in:
commit
1155bf20d9
@ -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;
|
||||
|
@ -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.
|
||||
|
Loading…
x
Reference in New Issue
Block a user