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

Fixed previous security patch. mysqld_safe will use the given --log=file,

Browse Source 
or if not given, it will try to use the one in datadir, if possible, otherwise
log file will be disabled.
This commit is contained in:
unknown 2004-04-07 19:37:13 +03:00
parent 3c8ae89052
commit 8b33254424
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/mysqld_multi.sh
View File

@ -9,7 +9,7 @@ $VER="2.6";
$opt_config_file = undef(); $opt_config_file = undef();
$opt_example = 0; $opt_example = 0;
$opt_help = 0; $opt_help = 0;
$opt_log = ""; $opt_log = undef();
$opt_mysqladmin = "@bindir@/mysqladmin"; $opt_mysqladmin = "@bindir@/mysqladmin";
$opt_mysqld = "@libexecdir@/mysqld"; $opt_mysqld = "@libexecdir@/mysqld";
$opt_no_log = 0; $opt_no_log = 0;
@ -47,7 +47,6 @@ sub main
print "MySQL distribution.\n"; print "MySQL distribution.\n";
$my_print_defaults_exists= 0; $my_print_defaults_exists= 0;
} }
init_log();
my @defops = `my_print_defaults mysqld_multi`; my @defops = `my_print_defaults mysqld_multi`;
chop @defops; chop @defops;
splice @ARGV, 0, 0, @defops; splice @ARGV, 0, 0, @defops;
@ -55,8 +54,8 @@ sub main
"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"; || die "Wrong option! See $my_progname --help for detailed information!\n";
init_log();
$groupids = $ARGV[1]; $groupids = $ARGV[1];
if ($opt_version) if ($opt_version)
{ {
print "$my_progname version $VER by Jani Tolonen\n"; print "$my_progname version $VER by Jani Tolonen\n";
@ -145,20 +144,9 @@ sub init_log
} }
if (!defined($logdir)) if (!defined($logdir))
{ {
$logdir= "/var/log" if (-d "/var/log" && -w "/var/log"); # Log file was not specified and we could not log to a standard place,
} # so log file be disabled for now.
if (!defined($logdir)) print "WARNING: Log file disabled. Maybe directory/file isn't writable?\n";
{
if (-d "/tmp" && -w "/tmp" && ! -e "/tmp/mysqld_multi.log")
{
$logdir= "/tmp";
}
}
if (!defined($logdir))
{
# We still couldn't get a default log file in place. Log file
# will be disabled unless user sets it with an option
$opt_no_log= 1; $opt_no_log= 1;
} }
else else