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
491017b1
Commit
491017b1
authored
Feb 17, 2007
by
tomas@poseidon.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
parents
9defcbbf
676647ad
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+1
-1
ndb/src/mgmsrv/InitConfigFileParser.cpp
ndb/src/mgmsrv/InitConfigFileParser.cpp
+7
-6
No files found.
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
View file @
491017b1
...
...
@@ -75,8 +75,8 @@ static BlockInfo ALL_BLOCKS[] = {
{
DBDICT_REF
,
1
,
6000
,
6003
},
{
NDBFS_REF
,
0
,
2000
,
2999
},
{
NDBCNTR_REF
,
0
,
1000
,
1999
},
{
CMVMI_REF
,
1
,
9000
,
9999
},
// before QMGR
{
QMGR_REF
,
1
,
1
,
999
},
{
CMVMI_REF
,
1
,
9000
,
9999
},
{
TRIX_REF
,
1
,
0
,
0
},
{
BACKUP_REF
,
1
,
10000
,
10999
},
{
DBUTIL_REF
,
1
,
11000
,
11999
},
...
...
ndb/src/mgmsrv/InitConfigFileParser.cpp
View file @
491017b1
...
...
@@ -799,6 +799,7 @@ InitConfigFileParser::parse_mycnf()
/**
* Add ndbd, ndb_mgmd, api/mysqld
*/
Uint32
idx
=
options
.
size
();
{
struct
my_option
opt
;
bzero
(
&
opt
,
sizeof
(
opt
));
...
...
@@ -808,7 +809,6 @@ InitConfigFileParser::parse_mycnf()
opt
.
var_type
=
GET_STR
;
opt
.
arg_type
=
REQUIRED_ARG
;
options
.
push_back
(
opt
);
ndbd
=
&
options
.
back
();
opt
.
name
=
"ndb_mgmd"
;
opt
.
id
=
256
;
...
...
@@ -816,7 +816,6 @@ InitConfigFileParser::parse_mycnf()
opt
.
var_type
=
GET_STR
;
opt
.
arg_type
=
REQUIRED_ARG
;
options
.
push_back
(
opt
);
ndb_mgmd
=
&
options
.
back
();
opt
.
name
=
"mysqld"
;
opt
.
id
=
256
;
...
...
@@ -824,20 +823,22 @@ InitConfigFileParser::parse_mycnf()
opt
.
var_type
=
GET_STR
;
opt
.
arg_type
=
REQUIRED_ARG
;
options
.
push_back
(
opt
);
mysqld
=
&
options
.
back
();
opt
.
name
=
"api"
;
opt
.
name
=
"
ndb
api"
;
opt
.
id
=
256
;
opt
.
value
=
(
gptr
*
)
malloc
(
sizeof
(
char
*
));
opt
.
var_type
=
GET_STR
;
opt
.
arg_type
=
REQUIRED_ARG
;
options
.
push_back
(
opt
);
api
=
&
options
.
back
();
bzero
(
&
opt
,
sizeof
(
opt
));
options
.
push_back
(
opt
);
}
ndbd
=
&
options
[
idx
];
ndb_mgmd
=
&
options
[
idx
+
1
];
mysqld
=
&
options
[
idx
+
2
];
api
=
&
options
[
idx
+
3
];
}
Context
ctx
(
m_info
,
m_errstream
);
const
char
*
groups
[]
=
{
"cluster_config"
,
0
};
...
...
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