1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1

Browse Source 
extra/comp_err.c:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
This commit is contained in:
unknown 2006-01-13 17:45:01 +01:00
commit ddab016fc4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extra/comp_err.c
View File

@ -159,7 +159,9 @@ static void get_options(register int *argc,register char **argv[])
case 'I': case 'I':
case '?': case '?':
printf(" %s (Compile errormessage) Ver 1.3\n",progname); 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); printf("Usage: %s [-?] [-I] [-V] fromfile[s] tofile\n",progname);
puts("Options: -Info -Version\n"); puts("Options: -Info -Version\n");
help=1; help=1;

3
scripts/mysqld_multi.sh
View File

@ -718,9 +718,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.