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
cecb618c
Commit
cecb618c
authored
Jan 11, 2005
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed parsing with comments on same line
parent
20067ffd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
mysql-test/ndb/ndb_config_2_node.ini
mysql-test/ndb/ndb_config_2_node.ini
+3
-3
ndb/src/mgmsrv/InitConfigFileParser.cpp
ndb/src/mgmsrv/InitConfigFileParser.cpp
+10
-2
No files found.
mysql-test/ndb/ndb_config_2_node.ini
View file @
cecb618c
...
@@ -9,13 +9,13 @@ DataDir= CHOOSE_FILESYSTEM
...
@@ -9,13 +9,13 @@ DataDir= CHOOSE_FILESYSTEM
MaxNoOfOrderedIndexes
=
CHOOSE_MaxNoOfOrderedIndexes
MaxNoOfOrderedIndexes
=
CHOOSE_MaxNoOfOrderedIndexes
[ndbd]
[ndbd]
HostName
=
CHOOSE_HOSTNAME_1
HostName
=
CHOOSE_HOSTNAME_1
# hostname is a valid network adress
[ndbd]
[ndbd]
HostName
=
CHOOSE_HOSTNAME_2
HostName
=
CHOOSE_HOSTNAME_2
# hostname is a valid network adress
[ndb_mgmd]
[ndb_mgmd]
DataDir
=
CHOOSE_FILESYSTEM
DataDir
=
CHOOSE_FILESYSTEM
#
PortNumber
=
CHOOSE_PORT_MGM
PortNumber
=
CHOOSE_PORT_MGM
[mysqld]
[mysqld]
...
...
ndb/src/mgmsrv/InitConfigFileParser.cpp
View file @
cecb618c
...
@@ -228,13 +228,21 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line)
...
@@ -228,13 +228,21 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line)
Vector
<
BaseString
>
tmp_string_split
;
Vector
<
BaseString
>
tmp_string_split
;
if
(
BaseString
(
line
).
split
(
tmp_string_split
,
if
(
BaseString
(
line
).
split
(
tmp_string_split
,
BaseString
(
"=:"
),
"=:"
,
2
)
!=
2
)
2
)
!=
2
)
{
{
ctx
.
reportError
(
"Parse error"
);
ctx
.
reportError
(
"Parse error"
);
return
false
;
return
false
;
}
}
// *************************************
// Remove all after #
// *************************************
Vector
<
BaseString
>
tmp_string_split2
;
tmp_string_split
[
1
].
split
(
tmp_string_split2
,
"#"
,
2
);
tmp_string_split
[
1
]
=
tmp_string_split2
[
0
];
// *************************************
// *************************************
// Remove leading and trailing chars
// Remove leading and trailing chars
// *************************************
// *************************************
...
...
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