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
6e4640fc
Commit
6e4640fc
authored
Aug 24, 2004
by
mronstrom@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix memory leak at certain failed create tables
parent
df1d90d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
16 deletions
+14
-16
ndb/src/kernel/blocks/dbdih/Dbdih.hpp
ndb/src/kernel/blocks/dbdih/Dbdih.hpp
+1
-0
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+13
-16
No files found.
ndb/src/kernel/blocks/dbdih/Dbdih.hpp
View file @
6e4640fc
...
...
@@ -943,6 +943,7 @@ private:
void
ndbStartReqLab
(
Signal
*
,
BlockReference
ref
);
void
nodeRestartStartRecConfLab
(
Signal
*
);
void
dihCopyCompletedLab
(
Signal
*
);
void
release_connect
(
ConnectRecordPtr
ptr
);
void
copyTableNode
(
Signal
*
,
CopyTableNode
*
ctn
,
NodeRecordPtr
regNodePtr
);
...
...
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @
6e4640fc
...
...
@@ -6075,13 +6075,9 @@ void Dbdih::execDIRELEASEREQ(Signal* signal)
ptrCheckGuard
(
connectPtr
,
cconnectFileSize
,
connectRecord
);
ndbrequire
(
connectPtr
.
p
->
connectState
!=
ConnectRecord
::
FREE
);
ndbrequire
(
connectPtr
.
p
->
userblockref
==
userRef
);
connectPtr
.
p
->
connectState
=
ConnectRecord
::
FREE
;
signal
->
theData
[
0
]
=
connectPtr
.
p
->
userpointer
;
sendSignal
(
connectPtr
.
p
->
userblockref
,
GSN_DIRELEASECONF
,
signal
,
1
,
JBB
);
connectPtr
.
p
->
nfConnect
=
cfirstconnect
;
cfirstconnect
=
connectPtr
.
i
;
connectPtr
.
p
->
userblockref
=
ZNIL
;
connectPtr
.
p
->
userpointer
=
RNIL
;
release_connect
(
connectPtr
);
}
//Dbdih::execDIRELEASEREQ()
/*
...
...
@@ -6518,11 +6514,16 @@ Dbdih::sendAddFragreq(Signal* signal, ConnectRecordPtr connectPtr,
DiAddTabConf
::
SignalLength
,
JBB
);
// Release
connectPtr
.
p
->
userblockref
=
ZNIL
;
connectPtr
.
p
->
userpointer
=
RNIL
;
connectPtr
.
p
->
connectState
=
ConnectRecord
::
FREE
;
connectPtr
.
p
->
nfConnect
=
cfirstconnect
;
cfirstconnect
=
connectPtr
.
i
;
release_connect
(
connectPtr
);
}
void
Dbdih
::
release_connect
(
ConnectRecordPtr
ptr
)
{
ptr
.
p
->
userblockref
=
ZNIL
;
ptr
.
p
->
userpointer
=
RNIL
;
ptr
.
p
->
connectState
=
ConnectRecord
::
FREE
;
ptr
.
p
->
nfConnect
=
cfirstconnect
;
cfirstconnect
=
ptr
.
i
;
}
void
...
...
@@ -6559,11 +6560,7 @@ Dbdih::execADD_FRAGREF(Signal* signal){
}
// Release
connectPtr
.
p
->
userblockref
=
ZNIL
;
connectPtr
.
p
->
userpointer
=
RNIL
;
connectPtr
.
p
->
connectState
=
ConnectRecord
::
FREE
;
connectPtr
.
p
->
nfConnect
=
cfirstconnect
;
cfirstconnect
=
connectPtr
.
i
;
release_connect
(
connectPtr
);
}
/*
...
...
@@ -6572,10 +6569,10 @@ Dbdih::execADD_FRAGREF(Signal* signal){
*/
void
Dbdih
::
addtabrefuseLab
(
Signal
*
signal
,
ConnectRecordPtr
connectPtr
,
Uint32
errorCode
)
{
connectPtr
.
p
->
connectState
=
ConnectRecord
::
INUSE
;
signal
->
theData
[
0
]
=
connectPtr
.
p
->
userpointer
;
signal
->
theData
[
1
]
=
errorCode
;
sendSignal
(
connectPtr
.
p
->
userblockref
,
GSN_DIADDTABREF
,
signal
,
2
,
JBB
);
release_connect
(
connectPtr
);
return
;
}
//Dbdih::addtabrefuseLab()
...
...
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