1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge with 4.0

This commit is contained in:
monty@mishka.local
2004-04-26 15:53:31 +03:00
125 changed files with 4571 additions and 4768 deletions

View File

@ -4,7 +4,7 @@ use Getopt::Long;
use POSIX qw(strftime);
$|=1;
$VER="2.6";
$VER="2.7";
$opt_config_file = undef();
$opt_example = 0;
@ -47,11 +47,35 @@ sub main
print "MySQL distribution.\n";
$my_print_defaults_exists= 0;
}
my @defops = `my_print_defaults mysqld_multi`;
chop @defops;
splice @ARGV, 0, 0, @defops;
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;
}
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();
@ -155,6 +179,45 @@ sub init_log
}
}
####
#### 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
####
@ -632,12 +695,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.