summaryrefslogtreecommitdiff
path: root/mysys/default.c
diff options
context:
space:
mode:
authorbrian@zim.(none) <>2006-04-15 08:49:00 -0700
committerbrian@zim.(none) <>2006-04-15 08:49:00 -0700
commitba2502b9c3b5bcc57115c9f325f12e4350a8bdfe (patch)
tree0016808c56b0545d9e84a1650e620b6bf9dc516b /mysys/default.c
parent36b897f4c6750b7bca2e03164998ab2dffe62d9a (diff)
downloadmariadb-git-ba2502b9c3b5bcc57115c9f325f12e4350a8bdfe.tar.gz
Another long patch to remove the rest of the OS2 support.
Diffstat (limited to 'mysys/default.c')
-rw-r--r--mysys/default.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/mysys/default.c b/mysys/default.c
index 90f8dc5f689..580bcc19eca 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -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))))