From eabf5230a258d4871f855c026b7bec02774d508b Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 7 Aug 2018 19:11:04 +0200
Subject: [PATCH] MDEV-16906 No groups to be reported (check your GNRs) -
 mysqld_multi does not see instances

make mysqld_multi to use same rules for my.cnf directories
that all other tools are using (see my_default.c).
---
 scripts/mysqld_multi.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 2ab70cdd4c3..10fcf2ae2b4 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -492,12 +492,19 @@ sub list_defaults_files
 
   return ($opt{file}) if exists $opt{file};
 
-  return      ('@sysconfdir@/my.cnf',
-               '@sysconfdir@/mysql/my.cnf',
-               '@prefix@/my.cnf',
-               ($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef),
-               $opt{'extra-file'},
-               ($ENV{HOME} ? "$ENV{HOME}/.my.cnf" : undef));
+  my @dirs;
+
+  # same rule as in mysys/my_default.c
+  if ('@sysconfdir@') {
+    push @dirs, '@sysconfdir@/my.cnf';
+  } 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;
 }