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

Added /etc/mysql to my.cnf search path after /etc.

Browse Source 
bug #25104
This commit is contained in:
mtaylor@qualinost.(none)
2006-12-15 12:34:36 -08:00
parent b1e7c78302
commit 265370f5c3
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysys/default.c
View File

@ -979,10 +979,11 @@ static uint my_get_system_windows_directory(char *buffer, uint size)
Everywhere else, this is: Everywhere else, this is:
1. /etc/ 1. /etc/
2. getenv(DEFAULT_HOME_ENV) 2. /etc/mysql/
3. "" 3. getenv(DEFAULT_HOME_ENV)
4. "~/" 4. ""
5. --sysconfdir=<path> 5. "~/"
6. --sysconfdir=<path>
*/ */
@ -1008,6 +1009,7 @@ static void init_default_directories()
*ptr++= env; *ptr++= env;
#endif #endif
*ptr++= "/etc/"; *ptr++= "/etc/";
*ptr++= "/etc/mysql/";
#endif #endif
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV)))) if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env; *ptr++= env;

10
scripts/mysqld_multi.sh
View File

@ -472,6 +472,14 @@ sub find_groups
{ {
$data[$i] = $line; $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" && if (defined($ENV{MYSQL_HOME}) && -f "$ENV{MYSQL_HOME}/my.cnf" &&
-r "$ENV{MYSQL_HOME}/my.cnf") -r "$ENV{MYSQL_HOME}/my.cnf")
{ {
@ -491,7 +499,7 @@ sub find_groups
$data[$i] = $line; $data[$i] = $line;
} }
} }
chop @data; chomp @data;
# Make a list of the wanted group ids # Make a list of the wanted group ids
if (defined($raw_gids)) if (defined($raw_gids))
{ {