diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-06-21 17:08:16 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-06-21 17:08:16 +0400 |
| commit | 07702953a27c1abd03ff263e4bcbb18379f158d7 (patch) | |
| tree | 30763ecb9f7a6e13fb5124138efb039fe120cc56 /mysys | |
| parent | 79c88453b29e4baac1eb0f7709a8766c07fc86d0 (diff) | |
| parent | 977be3ee94773481138abd01c25605ac09bbd5e6 (diff) | |
| download | mariadb-git-07702953a27c1abd03ff263e4bcbb18379f158d7.tar.gz | |
Auto-merge from mysql-trunk-stage.
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; } |