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

merge

Browse Source
This commit is contained in:
ramil@mysql.com 2005-02-25 16:34:17 +04:00
commit 4ab10bcedf
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

@ -171,8 +171,11 @@ int load_defaults(const char *conf_file, const char **groups,
{ {
if ((error= search_default_file_with_ext(&args, &alloc, "", "", if ((error= search_default_file_with_ext(&args, &alloc, "", "",
forced_default_file, forced_default_file,
&group)) < 0) &group)))
{
fprintf(stderr, "Error reading '%s' file.\n", forced_default_file);
goto err; goto err;
}
} }
else if (dirname_length(conf_file)) 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) else if (defaults_extra_file)
{ {
if (search_default_file(&args, &alloc, NullS, 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 */ goto err; /* Fatal error */
}
} }
} }
} }