summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2004-09-02 16:20:30 +0500
committerunknown <ram@gw.mysql.r18.ru>2004-09-02 16:20:30 +0500
commitf6834a5de08024c795a0506bbe906d4e6756c131 (patch)
treee2d5228ae58890e9d85b629dfafc6241f64de839 /mysys
parent4d5fee8e01693d5913972c88fcaf48e7124e2e45 (diff)
downloadmariadb-git-f6834a5de08024c795a0506bbe906d4e6756c131.tar.gz
A fix (bug #5056: defaults-extra-file throws no error when file is inaccessible).
Diffstat (limited to 'mysys')
-rw-r--r--mysys/default.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c
index 81290322223..e8195893ad8 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -164,8 +164,11 @@ int load_defaults(const char *conf_file, const char **groups,
if (forced_default_file)
{
if ((error= search_default_file(&args, &alloc, "",
- forced_default_file, "", &group)) < 0)
+ forced_default_file, "", &group)))
+ {
+ fprintf(stderr, "Error reading '%s' file.\n", forced_default_file);
goto err;
+ }
}
else if (dirname_length(conf_file))
{
@@ -199,8 +202,11 @@ int load_defaults(const char *conf_file, const char **groups,
else if (defaults_extra_file)
{
if (search_default_file(&args, &alloc, NullS, defaults_extra_file,
- default_ext, &group) < 0)
+ default_ext, &group))
+ {
+ fprintf(stderr, "Error reading '%s' file.\n", defaults_extra_file);
goto err; /* Fatal error */
+ }
}
}
}