Commit 0c75fbb3 authored by unknown's avatar unknown
Browse files

User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.

parent ddc600d2

mysys/default.c

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ const char *default_directories[]= { 
"sys:/etc/",

#else

"/etc/",

"/etc/mysql/",

#endif

#ifdef DATADIR

DATADIR,

scripts/mysqld_multi.sh

+0 −8
Original line number Diff line number Diff line
@@ -437,14 +437,6 @@ 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);