mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Auto-merge from mysql-trunk-stage.

Browse source
This commit is contained in:
Alexander Nozdrin 2010-06-21 17:08:16 +04:00
commit 07702953a2
38 changed files with 1301 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mysys/my_init.c
View file

@ -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;
}