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

- Merged in changes from mysqld_multi 2.6

Browse Source 
- Changed reading of config file so that one can use a separate config
  file for [mysqld_multi] also. In other words --config-file=file will
  read group [mysqld_multi] from this file, earlier it wouldn't have.
This commit is contained in:
unknown 2004-04-09 09:59:11 +03:00
parent 1f01df0e72
commit 9afbd246ef
1 changed files with 76 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
scripts/mysqld_multi.sh
View File

@ -4,12 +4,12 @@ use Getopt::Long;
use POSIX qw(strftime);
$|=1;
$VER="2.5";
$VER="2.7";
$opt_config_file = undef();
$opt_example = 0;
$opt_help = 0;
$opt_log = "/tmp/mysqld_multi.log";
$opt_log = undef();
$opt_mysqladmin = "@bindir@/mysqladmin";
$opt_mysqld = "@libexecdir@/mysqld";
$opt_no_log = 0;
@ -18,6 +18,9 @@ $opt_tcp_ip = 0;
$opt_user = "root";
$opt_version = 0;
my $my_print_defaults_exists= 1;
my $logdir= undef();
my ($mysqld, $mysqladmin, $groupids, $homedir, $my_progname);
$homedir = $ENV{HOME};
@ -42,16 +45,41 @@ sub main
print "Please make sure you have this command available and\n";
print "in your path. The command is available from the latest\n";
print "MySQL distribution.\n";
$my_print_defaults_exists= 0;
}
if ($my_print_defaults_exists)
{
foreach my $arg (@ARGV)
{
if ($arg =~ m/^--config-file=(.*)/)
{
if (!length($1))
{
die "Option config-file requires an argument\n";
}
elsif (!( -e $1 && -r $1))
{
die "Option file '$1' doesn't exists, or is not readable\n";
}
else
{
$opt_config_file= $1;
}
}
}
my $com= "my_print_defaults ";
$com.= "--config-file=$opt_config_file " if (defined($opt_config_file));
$com.= "mysqld_multi";
my @defops = `$com`;
chop @defops;
splice @ARGV, 0, 0, @defops;
}
my @defops = `my_print_defaults mysqld_multi`;
chop @defops;
splice @ARGV, 0, 0, @defops;
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","tcp-ip")
|| die "Wrong option! See $my_progname --help for detailed information!\n";
init_log();
$groupids = $ARGV[1];
if ($opt_version)
{
print "$my_progname version $VER by Jani Tolonen\n";
@ -112,6 +140,45 @@ sub main
}
}
####
#### Init log file. Check for appropriate place for log file, in the following
#### order my_print_defaults mysqld datadir, @datadir@, /var/log, /tmp
####
sub init_log
{
if ($my_print_defaults_exists)
{
@mysqld_opts= `my_print_defaults mysqld`;
chomp @mysqld_opts;
foreach my $opt (@mysqld_opts)
{
if ($opt =~ m/^\-\-datadir[=](.*)/)
{
if (-d "$1" && -w "$1")
{
$logdir= $1;
}
}
}
}
if (!defined($logdir))
{
$logdir= "@datadir@" if (-d "@datadir@" && -w "@datadir@");
}
if (!defined($logdir))
{
# Log file was not specified and we could not log to a standard place,
# so log file be disabled for now.
print "WARNING: Log file disabled. Maybe directory/file isn't writable?\n";
$opt_no_log= 1;
}
else
{
$opt_log= "$logdir/mysqld_multi.log";
}
}
####
#### Report living and not running MySQL servers
####
@ -589,12 +656,9 @@ reported. Note that you must not have any white spaces in the GNR
list. Anything after a white space are ignored.
Options:
--config-file=... Alternative config file. NOTE: This will not affect
this program's own options (group [mysqld_multi]),
but only groups [mysqld#]. Without this option everything
will be searched from the ordinary my.cnf file.
--config-file=... Alternative config file.
Using: $opt_config_file
--example Give an example of a config file. (PLEASE DO CHECK THIS!)
--example Give an example of a config file.
--help Print this help and exit.
--log=... Log file. Full path to and the name for the log file. NOTE:
If the file exists, everything will be appended.