summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-02-25 16:34:17 +0400
committerunknown <ramil@mysql.com>2005-02-25 16:34:17 +0400
commit106e12042f7c9d791ea4aa6f4a92f783fc757beb (patch)
treebadb2f66005b0d2bfddd60f9b05b059904188b0f
parent6a0e1def63b56f0c4c4c5873e70146c731189478 (diff)
parentf6834a5de08024c795a0506bbe906d4e6756c131 (diff)
downloadmariadb-git-106e12042f7c9d791ea4aa6f4a92f783fc757beb.tar.gz
merge
-rw-r--r--mysys/default.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c
index 364b2037f67..25e283a9650 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -171,8 +171,11 @@ int load_defaults(const char *conf_file, const char **groups,
{
if ((error= search_default_file_with_ext(&args, &alloc, "", "",
forced_default_file,
- &group)) < 0)
+ &group)))
+ {
+ fprintf(stderr, "Error reading '%s' file.\n", forced_default_file);
goto err;
+ }
}
else if (dirname_length(conf_file))
{
@@ -208,8 +211,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,
- &group) < 0)
+ &group))
+ {
+ fprintf(stderr, "Error reading '%s' file.\n", defaults_extra_file);
goto err; /* Fatal error */
+ }
}
}
}