MonetDB: octbugs - Merge with Oct2020 branch.

[Sjoerd Mullender]

Changeset: 0ffff8352fd3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ffff8352fd3
Modified Files:
        common/stream/stream.c
Branch: octbugs
Log Message:

Merge with Oct2020 branch.


diffs (41 lines):

diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -851,7 +851,7 @@ open_rstream(const char *filename)
 
        stream *c = compressed_stream(s, 0);
        if (c == NULL)
-               mnstr_destroy(s);
+               close_stream(s);
 
        return c;
 }
@@ -892,7 +892,7 @@ open_rastream(const char *filename)
 
        stream *t = create_text_stream(s);
        if (t == NULL)
-               mnstr_destroy(s);
+               close_stream(s);
 
        return t;
 }
@@ -911,7 +911,7 @@ open_wastream(const char *filename)
 
        stream *t = create_text_stream(s);
        if (t == NULL) {
-               mnstr_destroy(s);
+               close_stream(s);
                file_remove(filename);
        }
 
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3389,6 +3389,7 @@ leftjoin(BAT **r1p, BAT **r2p, BAT *l, B
                                                 false);
                                        r2->tsorted = false;
                                        r2->trevsorted = false;
+                                       r2->tseqbase = oid_nil;
                                        *r2p = r2;
                                } else {
                                        GDKqsort(r1->theap.base, NULL, NULL,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list