mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 22:34:18 +01:00
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
This commit is contained in:
commit
28ea588aa4
2 changed files with 4 additions and 6 deletions
|
@ -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;
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Add table
Reference in a new issue