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

MDEV-7341 mysqld_multi doesn't recognize include directive (not following includes)

Browse Source
This commit is contained in:
Sergei Golubchik 2015-12-05 15:25:15 +01:00
parent ef47b62551
commit e05883bf30
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/mysqld_multi.sh
View File

@ -486,6 +486,7 @@ sub get_mysqladmin_options
# Return a list of option files which can be opened. Similar, but not # Return a list of option files which can be opened. Similar, but not
# identical, to behavior of my_search_option_files() # identical, to behavior of my_search_option_files()
# TODO implement and use my_print_defaults --list-groups instead
sub list_defaults_files sub list_defaults_files
{ {
my %opt; my %opt;
@ -497,9 +498,7 @@ sub list_defaults_files
return ($opt{file}) if exists $opt{file}; return ($opt{file}) if exists $opt{file};
my %seen; # Don't list the same file more than once return ('/etc/my.cnf',
return grep { defined $_ and not $seen{$_}++ and -f $_ and -r $_ }
('/etc/my.cnf',
'/etc/mysql/my.cnf', '/etc/mysql/my.cnf',
'@sysconfdir@/my.cnf', '@sysconfdir@/my.cnf',
($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef), ($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef),
@ -539,11 +538,12 @@ sub find_groups
} }
} }
my %seen;
my @defaults_files = list_defaults_files(); my @defaults_files = list_defaults_files();
#warn "@{[sort keys %gids]} -> @defaults_files\n"; while (@defaults_files)
foreach my $file (@defaults_files)
{ {
next unless open CONF, "< $file"; my $file = shift @defaults_files;
next unless defined $file and not $seen{$file}++ and open CONF, '<', $file;
while (<CONF>) while (<CONF>)
{ {
@ -556,6 +556,14 @@ sub find_groups
push @groups, "$1$2"; push @groups, "$1$2";
} }
} }
elsif (/^\s*!include\s+(\S.*?)\s*$/)
{
push @defaults_files, $1;
}
elsif (/^\s*!includedir\s+(\S.*?)\s*$/)
{
push @defaults_files, <$1/*.cnf>;
}
} }
close CONF; close CONF;