Commit c2911678 authored by unknown's avatar unknown
Browse files

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

sql/ha_ndbcluster.cc

+3 −1
Original line number Diff line number Diff line
@@ -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);

        }

      }

    }