From f8f11eb2d9ad180eea685c4624d7540df24ec232 Mon Sep 17 00:00:00 2001 From: "mtaylor@qualinost.(none)" <> Date: Fri, 26 Jan 2007 12:17:50 -0800 Subject: [PATCH] Reverting change adding /etc/mysql support, as it breaks some installs. --- mysys/default.c | 10 ++++------ 1 file 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= + 2. getenv(DEFAULT_HOME_ENV) + 3. "" + 4. "~/" + 5. --sysconfdir= */ @@ -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;