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
2192d179
Commit
2192d179
authored
Sep 06, 2004
by
tomas@poseidon.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added ndb_mgm_destroy_configuration call
fixed memory leak in object map fixed uninitialized value blobs_pending
parent
73366eaf
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
ndb/include/mgmapi/mgmapi.h
ndb/include/mgmapi/mgmapi.h
+2
-1
ndb/src/mgmapi/mgmapi.cpp
ndb/src/mgmapi/mgmapi.cpp
+8
-0
ndb/src/ndbapi/ObjectMap.hpp
ndb/src/ndbapi/ObjectMap.hpp
+4
-1
ndb/src/ndbapi/ndb_cluster_connection.cpp
ndb/src/ndbapi/ndb_cluster_connection.cpp
+1
-1
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+1
-0
No files found.
ndb/include/mgmapi/mgmapi.h
View file @
2192d179
...
@@ -664,10 +664,11 @@ extern "C" {
...
@@ -664,10 +664,11 @@ extern "C" {
* @param handle NDB management handle.
* @param handle NDB management handle.
* @param version Version of configuration, 0 means latest
* @param version Version of configuration, 0 means latest
* @see MAKE_VERSION
* @see MAKE_VERSION
* @Note the caller must
free the pointer returned.
* @Note the caller must
call ndb_mgm_detroy_configuration
*/
*/
struct
ndb_mgm_configuration
*
ndb_mgm_get_configuration
(
NdbMgmHandle
handle
,
struct
ndb_mgm_configuration
*
ndb_mgm_get_configuration
(
NdbMgmHandle
handle
,
unsigned
version
);
unsigned
version
);
void
ndb_mgm_destroy_configuration
(
struct
ndb_mgm_configuration
*
);
int
ndb_mgm_alloc_nodeid
(
NdbMgmHandle
handle
,
int
ndb_mgm_alloc_nodeid
(
NdbMgmHandle
handle
,
unsigned
version
,
unsigned
version
,
...
...
ndb/src/mgmapi/mgmapi.cpp
View file @
2192d179
...
@@ -1508,6 +1508,14 @@ ndb_mgm_get_configuration(NdbMgmHandle handle, unsigned int version) {
...
@@ -1508,6 +1508,14 @@ ndb_mgm_get_configuration(NdbMgmHandle handle, unsigned int version) {
return
0
;
return
0
;
}
}
extern
"C"
void
ndb_mgm_destroy_configuration
(
struct
ndb_mgm_configuration
*
cfg
)
{
if
(
cfg
)
delete
(
ConfigValues
*
)
cfg
;
}
extern
"C"
extern
"C"
int
int
ndb_mgm_alloc_nodeid
(
NdbMgmHandle
handle
,
unsigned
int
version
,
unsigned
*
pnodeid
,
int
nodetype
)
ndb_mgm_alloc_nodeid
(
NdbMgmHandle
handle
,
unsigned
int
version
,
unsigned
*
pnodeid
,
int
nodetype
)
...
...
ndb/src/ndbapi/ObjectMap.hpp
View file @
2192d179
...
@@ -134,7 +134,10 @@ NdbObjectIdMap::expand(Uint32 incSize){
...
@@ -134,7 +134,10 @@ NdbObjectIdMap::expand(Uint32 incSize){
Uint32
newSize
=
m_size
+
incSize
;
Uint32
newSize
=
m_size
+
incSize
;
MapEntry
*
tmp
=
(
MapEntry
*
)
malloc
(
newSize
*
sizeof
(
MapEntry
));
MapEntry
*
tmp
=
(
MapEntry
*
)
malloc
(
newSize
*
sizeof
(
MapEntry
));
if
(
m_map
)
{
memcpy
(
tmp
,
m_map
,
m_size
*
sizeof
(
MapEntry
));
memcpy
(
tmp
,
m_map
,
m_size
*
sizeof
(
MapEntry
));
free
((
void
*
)
m_map
);
}
m_map
=
tmp
;
m_map
=
tmp
;
for
(
Uint32
i
=
m_size
;
i
<
newSize
;
i
++
){
for
(
Uint32
i
=
m_size
;
i
<
newSize
;
i
++
){
...
...
ndb/src/ndbapi/ndb_cluster_connection.cpp
View file @
2192d179
...
@@ -116,7 +116,7 @@ int Ndb_cluster_connection::connect(int reconnect)
...
@@ -116,7 +116,7 @@ int Ndb_cluster_connection::connect(int reconnect)
if
(
props
==
0
)
if
(
props
==
0
)
break
;
break
;
m_facade
->
start_instance
(
nodeId
,
props
);
m_facade
->
start_instance
(
nodeId
,
props
);
free
(
props
);
ndb_mgm_destroy_configuration
(
props
);
m_facade
->
connected
();
m_facade
->
connected
();
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
while
(
0
);
}
while
(
0
);
...
...
sql/ha_ndbcluster.cc
View file @
2192d179
...
@@ -3196,6 +3196,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
...
@@ -3196,6 +3196,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
bulk_insert_rows
(
1024
),
bulk_insert_rows
(
1024
),
bulk_insert_not_flushed
(
false
),
bulk_insert_not_flushed
(
false
),
ops_pending
(
0
),
ops_pending
(
0
),
blobs_pending
(
0
),
skip_auto_increment
(
true
),
skip_auto_increment
(
true
),
blobs_buffer
(
0
),
blobs_buffer
(
0
),
blobs_buffer_size
(
0
),
blobs_buffer_size
(
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