Commit 74162c77 authored by unknown's avatar unknown

Reverting change adding /etc/mysql support, as it breaks some installs.

parent 0f038a3b
...@@ -978,11 +978,10 @@ static uint my_get_system_windows_directory(char *buffer, uint size) ...@@ -978,11 +978,10 @@ static uint my_get_system_windows_directory(char *buffer, uint size)
Everywhere else, this is: Everywhere else, this is:
1. /etc/ 1. /etc/
2. /etc/mysql/ 2. getenv(DEFAULT_HOME_ENV)
3. getenv(DEFAULT_HOME_ENV) 3. ""
4. "" 4. "~/"
5. "~/" 5. --sysconfdir=<path>
6. --sysconfdir=<path>
*/ */
...@@ -1008,7 +1007,6 @@ static void init_default_directories() ...@@ -1008,7 +1007,6 @@ 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment