Commit 82976fe0 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
parents b36a87ae 79ad6ff2
...@@ -264,8 +264,24 @@ class Ndb_cond : public Sql_alloc ...@@ -264,8 +264,24 @@ class Ndb_cond : public Sql_alloc
~Ndb_cond() ~Ndb_cond()
{ {
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
*/
if (prev != NULL)
{
next= prev= NULL;
return;
}
Ndb_cond *n= next;
while (n)
{
Ndb_cond *tmp= n;
n= n->next;
delete tmp;
}
next= prev= NULL; next= prev= NULL;
}; };
Ndb_item *ndb_item; Ndb_item *ndb_item;
......
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