Commit 3c04f839 authored by unknown's avatar unknown
Browse files

support /etc/mysql/my.cnf in mysqld_multi as well.

parent 44945080

scripts/mysqld_multi.sh

+9 −1
Original line number Diff line number Diff line
@@ -437,6 +437,14 @@ sub find_groups 
    {

      $data[$i] = $line;

    }

    if (-f "/etc/mysql/my.cnf" && -r "/etc/mysql/my.cnf")

    {

      open(MY_CNF, "</etc/mysql/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);

    }

    for (; ($line = shift @tmp); $i++)

    {

      $data[$i] = $line;

    }

    if (-f "$homedir/.my.cnf" && -r "$homedir/.my.cnf")

    {

      open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
@@ -446,7 +454,7 @@ sub find_groups 
      $data[$i] = $line;

    }

  }

  chop @data;

  chomp @data;

  # Make a list of the wanted group ids

  if (defined($raw_gids))

  {