bk commit into 5.0 tree (tomas:1.2509) BUG#29185

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-19 12:14:02+02:00, tomas@stripped +1 -0
  Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown

  sql/ha_ndbcluster_cond.h@stripped, 2007-06-19 12:14:00+02:00, tomas@stripped
+18 -2
    Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb

--- 1.2/sql/ha_ndbcluster_cond.h	2007-04-23 12:12:10 +02:00
+++ 1.3/sql/ha_ndbcluster_cond.h	2007-06-19 12:14:00 +02:00
@@ -259,8 +259,24 @@
   ~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;