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
fc90cdb4
Commit
fc90cdb4
authored
20 years ago
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents
fb8b9ca6
b8713e5e
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
ndb/src/common/mgmcommon/ConfigRetriever.cpp
ndb/src/common/mgmcommon/ConfigRetriever.cpp
+10
-3
ndb/src/mgmsrv/main.cpp
ndb/src/mgmsrv/main.cpp
+1
-1
No files found.
ndb/src/common/mgmcommon/ConfigRetriever.cpp
View file @
fc90cdb4
...
...
@@ -238,7 +238,8 @@ ConfigRetriever::verifyConfig(const struct ndb_mgm_configuration * conf, Uint32
char
buf
[
255
];
ndb_mgm_configuration_iterator
*
it
;
it
=
ndb_mgm_create_configuration_iterator
((
struct
ndb_mgm_configuration
*
)
conf
,
CFG_SECTION_NODE
);
it
=
ndb_mgm_create_configuration_iterator
((
struct
ndb_mgm_configuration
*
)
conf
,
CFG_SECTION_NODE
);
if
(
it
==
0
){
BaseString
::
snprintf
(
buf
,
255
,
"Unable to create config iterator"
);
...
...
@@ -284,8 +285,14 @@ ConfigRetriever::verifyConfig(const struct ndb_mgm_configuration * conf, Uint32
}
if
(
_type
!=
m_node_type
){
BaseString
::
snprintf
(
buf
,
255
,
"Supplied node type(%d) and config node type(%d) "
" don't match"
,
m_node_type
,
_type
);
const
char
*
type_s
,
*
alias_s
,
*
type_s2
,
*
alias_s2
;
alias_s
=
ndb_mgm_get_node_type_alias_string
((
enum
ndb_mgm_node_type
)
m_node_type
,
&
type_s
);
alias_s2
=
ndb_mgm_get_node_type_alias_string
((
enum
ndb_mgm_node_type
)
_type
,
&
type_s2
);
BaseString
::
snprintf
(
buf
,
255
,
"This node type %s(%s) and config "
"node type %s(%s) don't match for nodeid %d"
,
alias_s
,
type_s
,
alias_s2
,
type_s2
,
nodeid
);
setError
(
CR_ERROR
,
buf
);
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
ndb/src/mgmsrv/main.cpp
View file @
fc90cdb4
...
...
@@ -216,7 +216,7 @@ int main(int argc, char** argv)
* Read configuration files *
****************************/
LocalConfig
local_config
;
if
(
!
local_config
.
init
(
0
,
glob
.
local_config_filename
)){
if
(
!
local_config
.
init
(
opt_connect_str
,
glob
.
local_config_filename
)){
local_config
.
printError
();
goto
error_end
;
}
...
...
This diff is collapsed.
Click to expand it.
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