diff options
author | ram@gw.mysql.r18.ru <> | 2004-09-02 16:20:30 +0500 |
---|---|---|
committer | ram@gw.mysql.r18.ru <> | 2004-09-02 16:20:30 +0500 |
commit | 8a61200b3d7619bb43c19fcafff353876bc66f99 (patch) | |
tree | e2d5228ae58890e9d85b629dfafc6241f64de839 /mysys | |
parent | 7b8b5d8969440a763467242efd75af41827419db (diff) | |
download | mariadb-git-8a61200b3d7619bb43c19fcafff353876bc66f99.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.c | 10 |
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 */ + } } } } |