Commit 051e6ac9 authored by mskold@mysql.com's avatar mskold@mysql.com
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents eb53a5b0 435c1028

sql/ha_ndbcluster.cc

+3 −1
Original line number Diff line number Diff line
@@ -7214,7 +7214,9 @@ void ndb_serialize_cond(const Item *item, void *arg) 
          prev_cond->next= curr_cond;

          curr_cond->ndb_item= new Ndb_item(NDB_END_COND);

          // Pop rewrite stack

          context->rewrite_stack= context->rewrite_stack->next;

          context->rewrite_stack=  rewrite_context->next;

          rewrite_context->next= NULL;

          delete(rewrite_context);

        }

      }

    }