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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
998873c9
Commit
998873c9
authored
Sep 11, 2004
by
petr@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a problem causing load_defaults not to accept some command-line
options.
parent
481e8954
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
mysys/default.c
mysys/default.c
+2
-4
No files found.
BitKeeper/etc/logging_ok
View file @
998873c9
...
@@ -144,6 +144,7 @@ pem@per-erik-martins-dator.local
...
@@ -144,6 +144,7 @@ pem@per-erik-martins-dator.local
peter@linux.local
peter@linux.local
peter@mysql.com
peter@mysql.com
peterg@mysql.com
peterg@mysql.com
petr@mysql.com
pgulutzan@linux.local
pgulutzan@linux.local
pmartin@build.mysql2.com
pmartin@build.mysql2.com
psergey@psergey-rh8.(none)
psergey@psergey-rh8.(none)
...
...
mysys/default.c
View file @
998873c9
...
@@ -119,8 +119,6 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
...
@@ -119,8 +119,6 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
int
error
=
0
;
int
error
=
0
;
DBUG_ENTER
(
"search_files"
);
DBUG_ENTER
(
"search_files"
);
args_used
=
0
;
/* Check if we want to force the use a specific default file */
/* Check if we want to force the use a specific default file */
forced_default_file
=
0
;
forced_default_file
=
0
;
if
(
*
argc
>=
2
)
if
(
*
argc
>=
2
)
...
@@ -128,12 +126,12 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
...
@@ -128,12 +126,12 @@ static int search_files(const char *conf_file, int *argc, char ***argv,
if
(
is_prefix
(
argv
[
0
][
1
],
"--defaults-file="
))
if
(
is_prefix
(
argv
[
0
][
1
],
"--defaults-file="
))
{
{
forced_default_file
=
strchr
(
argv
[
0
][
1
],
'='
)
+
1
;
forced_default_file
=
strchr
(
argv
[
0
][
1
],
'='
)
+
1
;
*
args_used
++
;
(
*
args_used
)
++
;
}
}
else
if
(
is_prefix
(
argv
[
0
][
1
],
"--defaults-extra-file="
))
else
if
(
is_prefix
(
argv
[
0
][
1
],
"--defaults-extra-file="
))
{
{
defaults_extra_file
=
strchr
(
argv
[
0
][
1
],
'='
)
+
1
;
defaults_extra_file
=
strchr
(
argv
[
0
][
1
],
'='
)
+
1
;
*
args_used
++
;
(
*
args_used
)
++
;
}
}
}
}
...
...
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