diff options
author | unknown <mtaylor@qualinost.(none)> | 2007-01-26 12:17:50 -0800 |
---|---|---|
committer | unknown <mtaylor@qualinost.(none)> | 2007-01-26 12:17:50 -0800 |
commit | 74162c7774cc44ece69e3b862ea8914d9bb765ab (patch) | |
tree | cad84840b706be16243426f888a476de6ed41660 /mysys/default.c | |
parent | 0f038a3bd8ba4242c2e918dddb30a65ac5c8d9a4 (diff) | |
download | mariadb-git-74162c7774cc44ece69e3b862ea8914d9bb765ab.tar.gz |
Reverting change adding /etc/mysql support, as it breaks some installs.
Diffstat (limited to 'mysys/default.c')
-rw-r--r-- | mysys/default.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mysys/default.c b/mysys/default.c index 12cd1713c31..97c52d01031 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -978,11 +978,10 @@ static uint my_get_system_windows_directory(char *buffer, uint size) Everywhere else, this is: 1. /etc/ - 2. /etc/mysql/ - 3. getenv(DEFAULT_HOME_ENV) - 4. "" - 5. "~/" - 6. --sysconfdir=<path> + 2. getenv(DEFAULT_HOME_ENV) + 3. "" + 4. "~/" + 5. --sysconfdir=<path> */ @@ -1008,7 +1007,6 @@ static void init_default_directories() *ptr++= env; #endif *ptr++= "/etc/"; - *ptr++= "/etc/mysql/"; #endif if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV)))) *ptr++= env; |