1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A fix (bug #5056: defaults-extra-file throws no error when file is inaccessible).

Browse Source
This commit is contained in:
ram@gw.mysql.r18.ru 2004-09-02 16:20:30 +05:00
parent 7b8b5d8969
commit 8a61200b3d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysys/default.c
View File

@ -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 */
}
}
}
}