diff options
| author | unknown <mskold@mysql.com> | 2006-04-25 14:07:41 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-04-25 14:07:41 +0200 |
| commit | ea564a7215b7267855892b3ef40898821d688ba5 (patch) | |
| tree | cedbbb09af21b77e5e886aacdcb2ed46ec724b03 /sql | |
| parent | 08f930375b5b393362f744aacd29197bb7b6ea57 (diff) | |
| parent | c2911678d5c02f5376d5ecf21ab4c26c51e29d03 (diff) | |
| download | mariadb-git-ea564a7215b7267855892b3ef40898821d688ba5.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index aa555e310cb..20844bf7e26 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -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); } } } |