MonetDB: default - Merge with Jul2017 branch.

[Sjoerd Mullender]

Changeset: ef37385dd8c2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef37385dd8c2
Modified Files:
        gdk/gdk_join.c
        monetdb5/modules/mal/txtsim.c
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (24 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1574,7 +1574,7 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT 
 
        if (sl)
                r1->tdense = sl->tdense;
-       if (sr)
+       if (r2 && sr)
                r2->tdense = sr->tdense;
        while (lcand ? lcand < lcandend : lstart < lend) {
                if (lscan == 0) {
diff --git a/monetdb5/modules/mal/txtsim.c b/monetdb5/modules/mal/txtsim.c
--- a/monetdb5/modules/mal/txtsim.c
+++ b/monetdb5/modules/mal/txtsim.c
@@ -887,7 +887,7 @@ CMDqgramselfjoin(bat *res1, bat *res2, b
        int *ibuf;
        int *pbuf;
        int *lbuf;
-       str msg;
+       str msg = MAL_SUCCEED;
 
        qgram = BATdescriptor(*qid);
        id = BATdescriptor(*bid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list