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
21153069
Commit
21153069
authored
Sep 30, 2005
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
export forced_defaults_file using global variable defaults_file
analog with defaults_extra_file and defaults_grouop_suffix
parent
1f84a139
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
include/my_sys.h
include/my_sys.h
+1
-0
mysys/default.c
mysys/default.c
+4
-0
No files found.
include/my_sys.h
View file @
21153069
...
@@ -262,6 +262,7 @@ extern char wild_many,wild_one,wild_prefix;
...
@@ -262,6 +262,7 @@ extern char wild_many,wild_one,wild_prefix;
extern
const
char
*
charsets_dir
;
extern
const
char
*
charsets_dir
;
extern
char
*
defaults_extra_file
;
extern
char
*
defaults_extra_file
;
extern
const
char
*
defaults_group_suffix
;
extern
const
char
*
defaults_group_suffix
;
extern
const
char
*
defaults_file
;
extern
my_bool
timed_mutexes
;
extern
my_bool
timed_mutexes
;
...
...
mysys/default.c
View file @
21153069
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
#include <winbase.h>
#include <winbase.h>
#endif
#endif
const
char
*
defaults_file
=
0
;
const
char
*
defaults_group_suffix
=
0
;
const
char
*
defaults_group_suffix
=
0
;
char
*
defaults_extra_file
=
0
;
char
*
defaults_extra_file
=
0
;
...
@@ -140,6 +141,9 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
...
@@ -140,6 +141,9 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
if
(
forced_extra_defaults
)
if
(
forced_extra_defaults
)
defaults_extra_file
=
forced_extra_defaults
;
defaults_extra_file
=
forced_extra_defaults
;
if
(
forced_default_file
)
defaults_file
=
forced_default_file
;
/*
/*
We can only handle 'defaults-group-suffix' if we are called from
We can only handle 'defaults-group-suffix' if we are called from
load_defaults() as otherwise we can't know the type of 'func_ctx'
load_defaults() as otherwise we can't know the type of 'func_ctx'
...
...
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