diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-06-19 15:28:26 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-06-19 15:28:26 +0200 |
| commit | f644f34ef4e63d51e0f7f642cd38a3e8cd4b13db (patch) | |
| tree | 0ff8e047ff45a73b99bf6ae25be960f046df9c4c /sql/ha_ndbcluster_cond.h | |
| parent | 7d74c33dd9803c3594d402c32c06aded5bf93cc4 (diff) | |
| parent | 897d4dfb8903efe4b3ba8cc6ed7d7114f3a86f62 (diff) | |
| download | mariadb-git-f644f34ef4e63d51e0f7f642cd38a3e8cd4b13db.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
sql/ha_ndbcluster_cond.h:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster_cond.h')
| -rw-r--r-- | sql/ha_ndbcluster_cond.h | 6 |
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; |