summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster_cond.h
diff options
context:
space:
mode:
authortomas@whalegate.ndb.mysql.com <>2007-06-19 15:28:26 +0200
committertomas@whalegate.ndb.mysql.com <>2007-06-19 15:28:26 +0200
commit7fa3b3cfa28265a2f678e7e7da758811f56d7575 (patch)
tree0ff8e047ff45a73b99bf6ae25be960f046df9c4c /sql/ha_ndbcluster_cond.h
parent82976fe018dfd0a7e519300852204312a8a036eb (diff)
parent895f2f15afcb7a4c4fba530318e3f3dba9e052bf (diff)
downloadmariadb-git-7fa3b3cfa28265a2f678e7e7da758811f56d7575.tar.gz
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
Diffstat (limited to 'sql/ha_ndbcluster_cond.h')
-rw-r--r--sql/ha_ndbcluster_cond.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/ha_ndbcluster_cond.h b/sql/ha_ndbcluster_cond.h
index 143bd5408eb..b6368afe262 100644
--- a/sql/ha_ndbcluster_cond.h
+++ b/sql/ha_ndbcluster_cond.h
@@ -270,16 +270,12 @@ class Ndb_cond : public Sql_alloc
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;
+ tmp->next= NULL;
delete tmp;
}
next= prev= NULL;