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
1bd774e9
Commit
1bd774e9
authored
Aug 24, 2004
by
tomas@poseidon.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more aliases in ndb config
parent
c81df5a0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
ndb/src/common/mgmcommon/ConfigInfo.cpp
ndb/src/common/mgmcommon/ConfigInfo.cpp
+2
-0
ndb/src/common/mgmcommon/InitConfigFileParser.cpp
ndb/src/common/mgmcommon/InitConfigFileParser.cpp
+3
-3
No files found.
ndb/src/common/mgmcommon/ConfigInfo.cpp
View file @
1bd774e9
...
@@ -29,6 +29,8 @@
...
@@ -29,6 +29,8 @@
const
ConfigInfo
::
AliasPair
const
ConfigInfo
::
AliasPair
ConfigInfo
::
m_sectionNameAliases
[]
=
{
ConfigInfo
::
m_sectionNameAliases
[]
=
{
{
"API"
,
"MYSQLD"
},
{
"API"
,
"MYSQLD"
},
{
"DB"
,
"NDBD"
},
{
"MGM"
,
"NDB_MGMD"
},
{
0
,
0
}
{
0
,
0
}
};
};
...
...
ndb/src/common/mgmcommon/InitConfigFileParser.cpp
View file @
1bd774e9
...
@@ -222,7 +222,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) {
...
@@ -222,7 +222,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) {
char
tmpLine
[
MAX_LINE_LENGTH
];
char
tmpLine
[
MAX_LINE_LENGTH
];
char
fname
[
MAX_LINE_LENGTH
],
rest
[
MAX_LINE_LENGTH
];
char
fname
[
MAX_LINE_LENGTH
],
rest
[
MAX_LINE_LENGTH
];
char
*
t
;
char
*
t
;
const
char
*
separator_list
[]
=
{
":"
,
"="
};
const
char
*
separator_list
[]
=
{
":"
,
"="
,
0
};
const
char
*
separator
=
0
;
const
char
*
separator
=
0
;
if
(
ctx
.
m_currentSection
==
NULL
){
if
(
ctx
.
m_currentSection
==
NULL
){
...
@@ -235,7 +235,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) {
...
@@ -235,7 +235,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) {
// *************************************
// *************************************
// Check if a separator exists in line
// Check if a separator exists in line
// *************************************
// *************************************
for
(
int
i
=
0
;
i
<
sizeof
(
separator_list
)
;
i
++
)
{
for
(
int
i
=
0
;
separator_list
[
i
]
!=
0
;
i
++
)
{
if
(
strchr
(
tmpLine
,
separator_list
[
i
][
0
]))
{
if
(
strchr
(
tmpLine
,
separator_list
[
i
][
0
]))
{
separator
=
separator_list
[
i
];
separator
=
separator_list
[
i
];
break
;
break
;
...
@@ -522,7 +522,7 @@ InitConfigFileParser::parseDefaultSectionHeader(const char* line) const {
...
@@ -522,7 +522,7 @@ InitConfigFileParser::parseDefaultSectionHeader(const char* line) const {
if
(
no
!=
2
)
return
NULL
;
if
(
no
!=
2
)
return
NULL
;
// Not correct keyword at end
// Not correct keyword at end
if
(
!
strcmp
(
token2
,
"DEFAULT"
)
==
0
)
return
NULL
;
if
(
!
strc
asec
mp
(
token2
,
"DEFAULT"
)
==
0
)
return
NULL
;
if
(
m_info
->
getInfo
(
token1
)){
if
(
m_info
->
getInfo
(
token1
)){
return
strdup
(
token1
);
return
strdup
(
token1
);
...
...
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