summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jani@a80-186-24-72.elisa-laajakaista.fi>2004-11-11 16:20:39 +0200
committerunknown <jani@a80-186-24-72.elisa-laajakaista.fi>2004-11-11 16:20:39 +0200
commitce62fb28c0d101ecf1971f388dcdfce1b3145158 (patch)
treea89c3a55af98e74509b840df108efe4ed91e12b3
parent4bbec092e41c0cca6f080428ca7d3e552f0d7d2b (diff)
downloadmariadb-git-ce62fb28c0d101ecf1971f388dcdfce1b3145158.tar.gz
Removed check for .ini file elsewhere, except on Windows.
-rw-r--r--mysys/default.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/default.c b/mysys/default.c
index 416de09b661..d260dd4b370 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -60,7 +60,11 @@ DATADIR,
NullS,
};
+#ifdef __WIN__
static const char *f_extensions[]= { ".ini", ".cnf", 0 };
+#else
+static const char *f_extensions[]= { ".cnf", 0 };
+#endif
static int search_default_file(DYNAMIC_ARRAY *args,MEM_ROOT *alloc,
const char *dir, const char *config_file,