database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-16906 No groups to be reported (check your GNRs) - mysqld_multi does not see instances

Browse Source 
make mysqld_multi to use same rules for my.cnf directories
that all other tools are using (see my_default.c).
This commit is contained in:
Sergei Golubchik
2018-08-07 19:11:04 +02:00
parent 26e2dd39c5
commit eabf5230a2
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/mysqld_multi.sh
View File

@ -492,12 +492,19 @@ sub list_defaults_files
return ($opt{file}) if exists $opt{file}; return ($opt{file}) if exists $opt{file};
return ('@sysconfdir@/my.cnf', my @dirs;
'@sysconfdir@/mysql/my.cnf',
'@prefix@/my.cnf', # same rule as in mysys/my_default.c
($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef), if ('@sysconfdir@') {
$opt{'extra-file'}, push @dirs, '@sysconfdir@/my.cnf';
($ENV{HOME} ? "$ENV{HOME}/.my.cnf" : undef)); } else {
push @dirs, '/etc/my.cnf', '/etc/mysql/my.cnf';
}
push @dirs, "$ENV{MYSQL_HOME}/my.cnf" if $ENV{MYSQL_HOME};
push @dirs, $opt{'extra-file'} if $opt{'extra-file'};
push @dirs, "$ENV{HOME}/.my.cnf" if $ENV{HOME};
return @dirs;
} }