Commit f56e58ea authored by Jonathan Perkin's avatar Jonathan Perkin

Fixes from wlad

parent f4013d13
[MYSQL] [MYSQL]
post_commit_to = "commits@lists.mysql.com" #post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com" #post_push_to = "commits@lists.mysql.com"
tree_name = "mysql-trunk" tree_name = "mysql-trunk"
...@@ -122,8 +122,12 @@ IF(UNIX) ...@@ -122,8 +122,12 @@ IF(UNIX)
IF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") IF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
IF(CMAKE_C_COMPILER_ID MATCHES "HP") IF(CMAKE_C_COMPILER_ID MATCHES "HP")
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g +O2 +DD64 +DSitanium2 -mt -AC99") SET(CMAKE_C_FLAGS
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g +O2 +DD64 +DSitanium2 -mt -Aa") "${CMAKE_C_FLAGS} +DD64 +DSitanium2 -mt -AC99")
SET(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} +DD64 +DSitanium2 -mt -Aa")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} +O2")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} +O2")
ENDIF() ENDIF()
ENDIF() ENDIF()
SET(WITH_SSL) SET(WITH_SSL)
......
...@@ -93,10 +93,6 @@ my_bool my_basic_init(void) ...@@ -93,10 +93,6 @@ my_bool my_basic_init(void)
my_umask_dir= (int) (atoi_octal(str) | 0700); my_umask_dir= (int) (atoi_octal(str) | 0700);
#endif #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(); init_glob_errs();
instrumented_stdin.m_file= stdin; instrumented_stdin.m_file= stdin;
...@@ -122,6 +118,10 @@ my_bool my_basic_init(void) ...@@ -122,6 +118,10 @@ my_bool my_basic_init(void)
return 1; return 1;
#endif #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; return 0;
} }
......
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