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
337396d1
Commit
337396d1
authored
18 years ago
by
stewart@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
parents
94019aed
9e05d61a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
7 deletions
+15
-7
ndb/include/util/ConfigValues.hpp
ndb/include/util/ConfigValues.hpp
+1
-0
ndb/src/common/util/ConfigValues.cpp
ndb/src/common/util/ConfigValues.cpp
+7
-1
ndb/src/mgmapi/mgmapi.cpp
ndb/src/mgmapi/mgmapi.cpp
+1
-1
ndb/src/mgmsrv/ConfigInfo.cpp
ndb/src/mgmsrv/ConfigInfo.cpp
+5
-4
ndb/src/mgmsrv/MgmtSrvr.cpp
ndb/src/mgmsrv/MgmtSrvr.cpp
+1
-1
No files found.
ndb/include/util/ConfigValues.hpp
View file @
337396d1
...
@@ -96,6 +96,7 @@ public:
...
@@ -96,6 +96,7 @@ public:
public:
public:
ConfigValuesFactory
(
Uint32
keys
=
50
,
Uint32
data
=
10
);
// Initial
ConfigValuesFactory
(
Uint32
keys
=
50
,
Uint32
data
=
10
);
// Initial
ConfigValuesFactory
(
ConfigValues
*
m_cfg
);
//
ConfigValuesFactory
(
ConfigValues
*
m_cfg
);
//
~
ConfigValuesFactory
();
ConfigValues
*
m_cfg
;
ConfigValues
*
m_cfg
;
ConfigValues
*
getConfigValues
();
ConfigValues
*
getConfigValues
();
...
...
This diff is collapsed.
Click to expand it.
ndb/src/common/util/ConfigValues.cpp
View file @
337396d1
...
@@ -294,6 +294,12 @@ ConfigValuesFactory::ConfigValuesFactory(ConfigValues * cfg){
...
@@ -294,6 +294,12 @@ ConfigValuesFactory::ConfigValuesFactory(ConfigValues * cfg){
}
}
}
}
ConfigValuesFactory
::~
ConfigValuesFactory
()
{
if
(
m_cfg
)
free
(
m_cfg
);
}
ConfigValues
*
ConfigValues
*
ConfigValuesFactory
::
create
(
Uint32
keys
,
Uint32
data
){
ConfigValuesFactory
::
create
(
Uint32
keys
,
Uint32
data
){
Uint32
sz
=
sizeof
(
ConfigValues
);
Uint32
sz
=
sizeof
(
ConfigValues
);
...
@@ -528,7 +534,7 @@ ConfigValuesFactory::extractCurrentSection(const ConfigValues::ConstIterator & c
...
@@ -528,7 +534,7 @@ ConfigValuesFactory::extractCurrentSection(const ConfigValues::ConstIterator & c
}
}
}
}
ConfigValues
*
ret
=
fac
->
m_cfg
;
ConfigValues
*
ret
=
fac
->
getConfigValues
()
;
delete
fac
;
delete
fac
;
return
ret
;
return
ret
;
}
}
...
...
This diff is collapsed.
Click to expand it.
ndb/src/mgmapi/mgmapi.cpp
View file @
337396d1
...
@@ -1945,7 +1945,7 @@ ndb_mgm_get_configuration(NdbMgmHandle handle, unsigned int version) {
...
@@ -1945,7 +1945,7 @@ ndb_mgm_get_configuration(NdbMgmHandle handle, unsigned int version) {
}
}
delete
prop
;
delete
prop
;
return
(
ndb_mgm_configuration
*
)
cvf
.
m_cfg
;
return
(
ndb_mgm_configuration
*
)
cvf
.
getConfigValues
()
;
}
while
(
0
);
}
while
(
0
);
delete
prop
;
delete
prop
;
...
...
This diff is collapsed.
Click to expand it.
ndb/src/mgmsrv/ConfigInfo.cpp
View file @
337396d1
...
@@ -2241,11 +2241,11 @@ ConfigInfo::ConfigInfo()
...
@@ -2241,11 +2241,11 @@ ConfigInfo::ConfigInfo()
if
(
!
m_info
.
getCopy
(
param
.
_section
,
&
section
))
{
if
(
!
m_info
.
getCopy
(
param
.
_section
,
&
section
))
{
Properties
newsection
(
true
);
Properties
newsection
(
true
);
m_info
.
put
(
param
.
_section
,
&
newsection
);
m_info
.
put
(
param
.
_section
,
&
newsection
);
// Get copy of section
m_info
.
getCopy
(
param
.
_section
,
&
section
);
}
}
// Get copy of section
m_info
.
getCopy
(
param
.
_section
,
&
section
);
// Create pinfo (parameter info) entry
// Create pinfo (parameter info) entry
Properties
pinfo
(
true
);
Properties
pinfo
(
true
);
pinfo
.
put
(
"Id"
,
param
.
_paramId
);
pinfo
.
put
(
"Id"
,
param
.
_paramId
);
...
@@ -2299,6 +2299,7 @@ ConfigInfo::ConfigInfo()
...
@@ -2299,6 +2299,7 @@ ConfigInfo::ConfigInfo()
// Replace section with modified section
// Replace section with modified section
m_info
.
put
(
param
.
_section
,
section
,
true
);
m_info
.
put
(
param
.
_section
,
section
,
true
);
delete
section
;
if
(
param
.
_type
!=
ConfigInfo
::
CI_SECTION
){
if
(
param
.
_type
!=
ConfigInfo
::
CI_SECTION
){
Properties
*
p
;
Properties
*
p
;
...
...
This diff is collapsed.
Click to expand it.
ndb/src/mgmsrv/MgmtSrvr.cpp
View file @
337396d1
...
@@ -1863,7 +1863,7 @@ MgmtSrvr::handleReceivedSignal(NdbApiSignal* signal)
...
@@ -1863,7 +1863,7 @@ MgmtSrvr::handleReceivedSignal(NdbApiSignal* signal)
break
;
break
;
case
GSN_EVENT_REP
:
case
GSN_EVENT_REP
:
{
{
EventReport
*
rep
=
CAST_PTR
(
EventReport
,
signal
->
getDataPtrSend
()
);
EventReport
*
rep
=
(
EventReport
*
)
signal
->
getDataPtr
(
);
if
(
rep
->
getNodeId
()
==
0
)
if
(
rep
->
getNodeId
()
==
0
)
rep
->
setNodeId
(
refToNode
(
signal
->
theSendersBlockRef
));
rep
->
setNodeId
(
refToNode
(
signal
->
theSendersBlockRef
));
eventReport
(
signal
->
getDataPtr
());
eventReport
(
signal
->
getDataPtr
());
...
...
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