mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source
This commit is contained in:
unknown 2005-02-25 16:34:17 +04:00
commit 106e12042f
1 changed files with 8 additions and 2 deletions
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, "", "",
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 */
}
}
}
}