MonetDB: arrays - fixed two bugs

[Foteini Alvanaki]

Changeset: ad114d561415 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad114d561415
Modified Files:
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_gencode.c
Branch: arrays
Log Message:

fixed two bugs


diffs (26 lines):

diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1815,7 +1815,9 @@ static stmt *rel2bin_array_join(mvc *sql
 static bool isArrayRelated(sql_rel *rel) {
        sql_table *tbl = (sql_table*)rel->l;
 
-       return isArray(tbl);
+       if(tbl)
+               return isArray(tbl);
+       return false;
 }
 
 static stmt *
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2424,7 +2424,7 @@ static int
                        if (q == NULL)
                                return -1;
                        s->nr = getDestVar(q);
-                       if(arrayRelated >= 0)
+                       if(arrayRelated)
                                renameVariable(mb, getArg(q, 1), "Y_%d", s->nr);
 
                        arrayRelated = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list