MonetDB: Oct2014 - Merge with Jan2014 branch.

[Sjoerd Mullender]

Changeset: 05c3b6c5610b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05c3b6c5610b
Modified Files:
        monetdb5/mal/mal_profiler.c
Branch: Oct2014
Log Message:

Merge with Jan2014 branch.


diffs (12 lines):

diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -590,7 +590,7 @@ openProfilerStream(stream *fd)
 str
 closeProfilerStream(void)
 {
-       if (eventstream && eventstream != GDKout && eventstream != GDKerr) {
+       if (eventstream && eventstream != mal_clients[0].fdout && eventstream 
!= GDKout && eventstream != GDKerr) {
                (void)mnstr_close(eventstream);
                (void)mnstr_destroy(eventstream);
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list