Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
This commit is contained in:
commit
ea564a7215
@ -8948,7 +8948,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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user