Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
8a61200b
Commit
8a61200b
authored
Sep 02, 2004
by
ram@gw.mysql.r18.ru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A fix (bug #5056: defaults-extra-file throws no error when file is inaccessible).
parent
7b8b5d89
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
mysys/default.c
mysys/default.c
+8
-2
No files found.
mysys/default.c
View file @
8a61200b
...
@@ -164,8 +164,11 @@ int load_defaults(const char *conf_file, const char **groups,
...
@@ -164,8 +164,11 @@ int load_defaults(const char *conf_file, const char **groups,
if
(
forced_default_file
)
if
(
forced_default_file
)
{
{
if
((
error
=
search_default_file
(
&
args
,
&
alloc
,
""
,
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
;
goto
err
;
}
}
}
else
if
(
dirname_length
(
conf_file
))
else
if
(
dirname_length
(
conf_file
))
{
{
...
@@ -199,8 +202,11 @@ int load_defaults(const char *conf_file, const char **groups,
...
@@ -199,8 +202,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
,
default_ext
,
&
group
)
<
0
)
default_ext
,
&
group
))
{
fprintf
(
stderr
,
"Error reading '%s' file.
\n
"
,
defaults_extra_file
);
goto
err
;
/* Fatal error */
goto
err
;
/* Fatal error */
}
}
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment