MonetDB: default - merged with jul2021

[Niels Nes]

Changeset: 7dc3572154f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7dc3572154f2
Branch: default
Log Message:

merged with jul2021


diffs (33 lines):

diff --git a/geom/sql/conformance/Tests/All b/geom/sql/conformance/Tests/All
--- a/geom/sql/conformance/Tests/All
+++ b/geom/sql/conformance/Tests/All
@@ -47,7 +47,7 @@ HAVE_GEOM?T45
 HAVE_GEOM?T46
 HAVE_GEOM?T47
 HAVE_GEOM?T48
-HAVE_GEOM?T49
+#HAVE_GEOM?T49 # disabled because depends on geos library version
 HAVE_GEOM?T50
 HAVE_GEOM?T51
 HAVE_GEOM?T52
diff --git a/monetdb5/optimizer/opt_mergetable.c 
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -888,7 +888,7 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb, 
        InstrPtr r;
        mat_t *mat = ml->v;
        int *mats = (int*)GDKzalloc(sizeof(int) * args);
-       int nr_mats = 0, first = 0, res = 0;
+       int nr_mats = 0, first = -1, res = 0;
 
        if (!mats) {
                return -1;
@@ -898,7 +898,7 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb, 
                mats[j] = is_a_mat(getArg(p,p->retc+j), ml);
                if (mats[j] != -1) {
                        nr_mats++;
-                       if (!first)
+                       if (first < 0)
                                first = j;
                }
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list