diff options
| author | Daniel Fischer <df@sun.com> | 2010-06-18 17:04:15 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2010-06-18 17:04:15 +0200 |
| commit | 073943cd7dc1b1c897543ffb704b821de942b07b (patch) | |
| tree | 129482b631bc451c9ff9b99ac55692b6bec2563d /mysys | |
| parent | b79631bc7a2cdcb46f34d6e37e1597a6e71f09b1 (diff) | |
| parent | d6fe8c47b88faf5074f55d698a9b9af97d17fdd4 (diff) | |
| download | mariadb-git-073943cd7dc1b1c897543ffb704b821de942b07b.tar.gz | |
merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index f27f3f7b3e8..5bda2cb03ac 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -93,10 +93,6 @@ my_bool my_basic_init(void) my_umask_dir= (int) (atoi_octal(str) | 0700); #endif - /* $HOME is needed early to parse configuration files located in ~/ */ - if ((home_dir= getenv("HOME")) != 0) - home_dir= intern_filename(home_dir_buff, home_dir); - init_glob_errs(); instrumented_stdin.m_file= stdin; @@ -122,6 +118,10 @@ my_bool my_basic_init(void) return 1; #endif + /* $HOME is needed early to parse configuration files located in ~/ */ + if ((home_dir= getenv("HOME")) != 0) + home_dir= intern_filename(home_dir_buff, home_dir); + return 0; } |