MonetDB: Feb2013 - Merge with Oct2012 branch.

[Sjoerd Mullender]

Changeset: 7ffb8c99eb9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ffb8c99eb9a
Modified Files:
        monetdb5/mal/mal_dataflow.c
Branch: Feb2013
Log Message:

Merge with Oct2012 branch.


diffs (20 lines):

diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -127,6 +127,8 @@ q_create(int sz)
 static void
 q_destroy(queue *q)
 {
+       MT_lock_destroy(&q->l);
+       MT_sema_destroy(&q->s);
        GDKfree(q->data);
        GDKfree(q);
 }
@@ -614,6 +616,7 @@ runMALdataflow(Client cntxt, MalBlkPtr m
        GDKfree(flow->edges);
        GDKfree(flow->nodes);
        q_destroy(flow->done);
+       MT_lock_destroy(&flow->flowlock);
        GDKfree(flow);
        return ret;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list