diff options
| author | mtaylor@qualinost.(none) <> | 2006-12-15 12:34:36 -0800 |
|---|---|---|
| committer | mtaylor@qualinost.(none) <> | 2006-12-15 12:34:36 -0800 |
| commit | 265370f5c3a324c7d063739d6c0b42c1a746dc1b (patch) | |
| tree | 3f731c7641f9ecf2d893f9c009c9ad6b1de6bb2b | |
| parent | b1e7c78302cb27eac77bcef5ef3bde19bff59197 (diff) | |
| download | mariadb-git-265370f5c3a324c7d063739d6c0b42c1a746dc1b.tar.gz | |
Added /etc/mysql to my.cnf search path after /etc.
bug #25104
| -rw-r--r-- | mysys/default.c | 10 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/mysys/default.c b/mysys/default.c index d93f4135e73..a147163e938 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -979,10 +979,11 @@ static uint my_get_system_windows_directory(char *buffer, uint size) Everywhere else, this is: 1. /etc/ - 2. getenv(DEFAULT_HOME_ENV) - 3. "" - 4. "~/" - 5. --sysconfdir=<path> + 2. /etc/mysql/ + 3. getenv(DEFAULT_HOME_ENV) + 4. "" + 5. "~/" + 6. --sysconfdir=<path> */ @@ -1008,6 +1009,7 @@ static void init_default_directories() *ptr++= env; #endif *ptr++= "/etc/"; + *ptr++= "/etc/mysql/"; #endif if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV)))) *ptr++= env; diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 2dcc8dc7bc4..6ac31a00c75 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -472,6 +472,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 (defined($ENV{MYSQL_HOME}) && -f "$ENV{MYSQL_HOME}/my.cnf" && -r "$ENV{MYSQL_HOME}/my.cnf") { @@ -491,7 +499,7 @@ sub find_groups $data[$i] = $line; } } - chop @data; + chomp @data; # Make a list of the wanted group ids if (defined($raw_gids)) { |