New thr_alarm struct for better integration with OS2

Run bootstrap in separate thread
Fix bug in FLUSH TABLES table_name

1 files changed, 10 insertions, 0 deletions

diff --git a/mysys/default.c b/mysys/default.c
index e7e2e7cc8ff..6518fb5816f 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -146,6 +146,12 @@ void load_defaults(const char *conf_file, const char **groups,
 			    &group))
       goto err;
 #endif
+#ifdef __EMX__
+    if (getenv("ETC") &&
+        search_default_file(&args, &alloc, getenv("ETC"), conf_file, 
+                            default_ext, &group))
+      goto err;
+#endif
     for (dirs=default_directories ; *dirs; dirs++)
     {
       int error=0;
@@ -357,6 +363,10 @@ void print_defaults(const char *conf_file, const char **groups)
     GetWindowsDirectory(name,sizeof(name));
     printf("%s\\%s%s ",name,conf_file,have_ext ? "" : windows_ext);
 #endif
+#ifdef __EMX__
+    if (getenv("ETC"))
+      printf("%s\\%s%s ", getenv("ETC"), conf_file, default_ext);
+#endif
     for (dirs=default_directories ; *dirs; dirs++)
     {
       if (**dirs)