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
4ab10bce
Commit
4ab10bce
authored
Feb 25, 2005
by
ramil@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
a4cdb93b
8a61200b
Changes
1
Show 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 @
4ab10bce
...
@@ -171,9 +171,12 @@ int load_defaults(const char *conf_file, const char **groups,
...
@@ -171,9 +171,12 @@ 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
))
{
{
if
((
error
=
search_default_file
(
&
args
,
&
alloc
,
NullS
,
conf_file
,
if
((
error
=
search_default_file
(
&
args
,
&
alloc
,
NullS
,
conf_file
,
...
@@ -208,11 +211,14 @@ int load_defaults(const char *conf_file, const char **groups,
...
@@ -208,11 +211,14 @@ 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 */
}
}
}
}
}
}
}
/*
/*
Here error contains <> 0 only if we have a fully specified conf_file
Here error contains <> 0 only if we have a fully specified conf_file
or a forced default file
or a forced default file
...
...
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