mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 09:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Bug#9835: mysqld_multi --help won't output help if there are

Browse source 
parameter problems.
This commit is contained in:
unknown 2005-04-26 14:28:22 +03:00
parent e6675ed3ac
commit 2f24a41c30
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scripts/mysqld_multi.sh
View file

@ -4,7 +4,7 @@ use Getopt::Long;
use POSIX qw(strftime); use POSIX qw(strftime);
$|=1; $|=1;
$VER="2.12"; $VER="2.13";
$opt_config_file = undef(); $opt_config_file = undef();
$opt_example = 0; $opt_example = 0;
@ -37,13 +37,13 @@ main();
sub main sub main
{ {
my ($flag_exit); my $flag_exit= 0;
if (!defined(my_which(my_print_defaults))) if (!defined(my_which(my_print_defaults)))
{ {
# We can't throw out yet, since --version, --help, or --example may # We can't throw out yet, since --version, --help, or --example may
# have been given # have been given
print "WARNING! my_print_defaults command not found!\n"; print "WARNING: my_print_defaults command not found.\n";
print "Please make sure you have this command available and\n"; print "Please make sure you have this command available and\n";
print "in your path. The command is available from the latest\n"; print "in your path. The command is available from the latest\n";
print "MySQL distribution.\n"; print "MySQL distribution.\n";
@ -76,10 +76,14 @@ sub main
chop @defops; chop @defops;
splice @ARGV, 0, 0, @defops; splice @ARGV, 0, 0, @defops;
} }
GetOptions("help","example","version","mysqld=s","mysqladmin=s", if (!GetOptions("help","example","version","mysqld=s","mysqladmin=s",
"config-file=s","user=s","password=s","log=s","no-log","tcp-ip", "config-file=s","user=s","password=s","log=s","no-log",
"silent","verbose") "tcp-ip", "silent","verbose"))
|| die "Wrong option! See $my_progname --help for detailed information!\n"; {
$flag_exit= 1;
}
usage() if ($opt_help);
if ($opt_verbose && $opt_silent) if ($opt_verbose && $opt_silent)
{ {
@ -95,15 +99,14 @@ sub main
exit(0); exit(0);
} }
example() if ($opt_example); example() if ($opt_example);
usage() if ($opt_help);
if ($flag_exit) if ($flag_exit)
{ {
print "Error with an option, see $my_progname --help for more info!\n"; print "Error with an option, see $my_progname --help for more info.\n";
exit(1); exit(1);
} }
if (!defined(my_which(my_print_defaults))) if (!defined(my_which(my_print_defaults)))
{ {
print "ABORT: Can't find command 'my_print_defaults'!\n"; print "ABORT: Can't find command 'my_print_defaults'.\n";
print "This command is available from the latest MySQL\n"; print "This command is available from the latest MySQL\n";
print "distribution. Please make sure you have the command\n"; print "distribution. Please make sure you have the command\n";
print "in your PATH.\n"; print "in your PATH.\n";