Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster_cond.h: Auto merged
This commit is contained in:
commit
7d74c33dd9
@ -264,8 +264,24 @@ 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
|
||||
*/
|
||||
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;
|
||||
};
|
||||
Ndb_item *ndb_item;
|
||||
|
Loading…
x
Reference in New Issue
Block a user