mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into debian.(none):/M51/mysql-5.1
This commit is contained in:
unknown 2006-01-18 11:15:44 +01:00
commit 28ea588aa4
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
extra/comp_err.c
View file

@ -876,9 +876,10 @@ static void usage(void)
{ {
DBUG_ENTER("usage"); DBUG_ENTER("usage");
print_version(); print_version();
printf("This software comes with ABSOLUTELY NO WARRANTY. This is free " printf("This software comes with ABSOLUTELY NO WARRANTY. "
"software,\nand you are welcome to modify and redistribute it under " "This is free software,\n"
"the GPL license\nUsage:\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_help(my_long_options);
my_print_variables(my_long_options); my_print_variables(my_long_options);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;

3
scripts/mysqld_multi.sh
View file

@ -763,9 +763,6 @@ sub usage
print <<EOF; print <<EOF;
$my_progname version $VER by Jani Tolonen $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: Description:
$my_progname can be used to start, or stop any number of separate $my_progname can be used to start, or stop any number of separate
mysqld processes running in different TCP/IP ports and UNIX sockets. mysqld processes running in different TCP/IP ports and UNIX sockets.