mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/merge-5.1

Browse source
This commit is contained in:
joerg@mysql.com 2006-01-17 18:35:13 +01:00
commit 17cdeb0489
2 changed files with 4 additions and 6 deletions

7
extra/comp_err.c
View file

@ -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;

3
scripts/mysqld_multi.sh
View file

@ -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.