mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Another long patch to remove the rest of the OS2 support.
include/config-win.h: Removing OS2 stuff include/errmsg.h: Removing OS2 stuff include/m_string.h: OS2 removal include/my_global.h: OS2 removal include/my_net.h: OS2 removal include/my_no_pthread.h: OS2 removal include/my_pthread.h: OS2 removal include/thr_alarm.h: OS2 removal mysys/default.c: OS2 removal mysys/mf_path.c: OS2 removal mysys/mf_tempdir.c: OS2 removal mysys/mf_tempfile.c: OS2 removal mysys/my_access.c: OS2 removal mysys/my_clock.c: OS2 removal mysys/my_copy.c: OS2 removal mysys/my_create.c: OS2 removal mysys/my_dup.c: OS2 removal mysys/my_file.c: OS2 removal mysys/my_getwd.c: OS2 removal mysys/my_init.c: OS2 removal mysys/my_lib.c: OS2 removal mysys/my_lock.c: OS2 removal mysys/my_mkdir.c: OS2 removal mysys/my_open.c: OS2 removal mysys/my_pthread.c: OS2 removal mysys/my_redel.c: OS2 removal mysys/my_sleep.c: OS2 removal mysys/my_static.c: OS2 removal mysys/my_thr_init.c: OS2 removal mysys/thr_alarm.c: OS2 removal storage/myisam/myisamchk.c: OS2 removal
This commit is contained in:
@ -601,7 +601,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
|
||||
strmov(name,config_file);
|
||||
}
|
||||
fn_format(name,name,"","",4);
|
||||
#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
|
||||
#if !defined(__WIN__) && !defined(__NETWARE__)
|
||||
{
|
||||
MY_STAT stat_info;
|
||||
if (!my_stat(name,&stat_info,MYF(0)))
|
||||
@ -1001,10 +1001,6 @@ static void init_default_directories()
|
||||
#elif defined(__NETWARE__)
|
||||
*ptr++= "sys:/etc/";
|
||||
#else
|
||||
#if defined(__EMX__) || defined(OS2)
|
||||
if ((env= getenv("ETC")))
|
||||
*ptr++= env;
|
||||
#endif
|
||||
*ptr++= "/etc/";
|
||||
#endif
|
||||
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
|
||||
|
Reference in New Issue
Block a user