mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

Browse source 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


sql/ha_ndbcluster_cond.h:
  Auto merged
This commit is contained in:
unknown 2007-06-20 06:26:23 +02:00
commit 461a4a8334
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sql/ha_ndbcluster_cond.h
View file

@ -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;

2
storage/ndb/src/kernel/vm/RWPool.cpp
View file

@ -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)