Commit 3bd4019f authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com

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
...@@ -265,7 +265,19 @@ class Ndb_cond : public Sql_alloc ...@@ -265,7 +265,19 @@ class Ndb_cond : public Sql_alloc
{ {
if (ndb_item) delete ndb_item; if (ndb_item) delete ndb_item;
ndb_item= NULL; ndb_item= NULL;
if (next) delete next; /*
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; next= prev= NULL;
}; };
Ndb_item *ndb_item; Ndb_item *ndb_item;
......
...@@ -140,7 +140,7 @@ RWPool::release(Ptr<void> ptr) ...@@ -140,7 +140,7 @@ RWPool::release(Ptr<void> ptr)
Uint32 ff = page->m_first_free; Uint32 ff = page->m_first_free;
* (record_ptr + m_record_info.m_offset_next_pool) = ff; * (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; page->m_ref_count = ref_cnt - 1;
if (ff == REC_NIL) if (ff == REC_NIL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment