Commit c2911678 authored by unknown's avatar unknown

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
parents c9841352 e42428d5
...@@ -8948,7 +8948,9 @@ void ndb_serialize_cond(const Item *item, void *arg) ...@@ -8948,7 +8948,9 @@ void ndb_serialize_cond(const Item *item, void *arg)
prev_cond->next= curr_cond; prev_cond->next= curr_cond;
curr_cond->ndb_item= new Ndb_item(NDB_END_COND); curr_cond->ndb_item= new Ndb_item(NDB_END_COND);
// Pop rewrite stack // Pop rewrite stack
context->rewrite_stack= context->rewrite_stack->next; context->rewrite_stack= rewrite_context->next;
rewrite_context->next= NULL;
delete(rewrite_context);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment