diff options
| author | unknown <mtaylor@qualinost.(none)> | 2006-12-15 13:23:57 -0800 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2006-12-15 13:23:57 -0800 |
| commit | b027f833a12003a586e5f312650b37581ce73be0 (patch) | |
| tree | b8879a3b6f7ae88bc7cf2d77ab7918618dedba56 /mysys/default.c | |
| parent | 8cad8f9bce859f229fd63ac2a4b37dadcc01aaf5 (diff) | |
| parent | fad8db22085e55712d7c306184c59754f5142995 (diff) | |
| download | mariadb-git-b027f833a12003a586e5f312650b37581ce73be0.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
mysql-test/r/myisam.result:
Auto merged
mysys/default.c:
Auto merged
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysys/default.c b/mysys/default.c index b3c6b8ed72a..1c6d1784ee7 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -987,10 +987,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> */ @@ -1012,6 +1013,7 @@ static void init_default_directories() *ptr++= "sys:/etc/"; #else *ptr++= "/etc/"; + *ptr++= "/etc/mysql/"; #endif if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV)))) *ptr++= env; |