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
3bd4019f
Commit
3bd4019f
authored
Jun 20, 2007
by
tomas@whalegate.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
parents
5dd26788
956b9205
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_cond.h
+14
-2
storage/ndb/src/kernel/vm/RWPool.cpp
storage/ndb/src/kernel/vm/RWPool.cpp
+1
-1
No files found.
sql/ha_ndbcluster_cond.h
View file @
3bd4019f
...
...
@@ -264,8 +264,20 @@ class Ndb_cond : public Sql_alloc
~
Ndb_cond
()
{
if
(
ndb_item
)
delete
ndb_item
;
ndb_item
=
NULL
;
if
(
next
)
delete
next
;
ndb_item
=
NULL
;
/*
First item in the linked list deletes all in a loop
Note - doing it recursively causes stack issues for
big IN clauses
*/
Ndb_cond
*
n
=
next
;
while
(
n
)
{
Ndb_cond
*
tmp
=
n
;
n
=
n
->
next
;
tmp
->
next
=
NULL
;
delete
tmp
;
}
next
=
prev
=
NULL
;
};
Ndb_item
*
ndb_item
;
...
...
storage/ndb/src/kernel/vm/RWPool.cpp
View file @
3bd4019f
...
...
@@ -140,7 +140,7 @@ RWPool::release(Ptr<void> ptr)
Uint32
ff
=
page
->
m_first_free
;
*
(
record_ptr
+
m_record_info
.
m_offset_next_pool
)
=
ff
;
page
->
m_first_free
=
ptr
.
i
;
page
->
m_first_free
=
ptr
.
i
&
POOL_RECORD_MASK
;
page
->
m_ref_count
=
ref_cnt
-
1
;
if
(
ff
==
REC_NIL
)
...
...
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