MonetDB: default - Compilation fix and cleanup

[Pedro Ferreira]

Changeset: 033ce3060b3d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=033ce3060b3d
Modified Files:
        sql/backends/monet5/sql.c
Branch: default
Log Message:

Compilation fix and cleanup


diffs (21 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5659,7 +5659,6 @@ SQLunionfunc(Client cntxt, MalBlkPtr mb,
                                }
                                if (!ret && ii == q->argc) {
                                        BAT *fres = NULL;
-                                       BUN ccnt = 0;
                                        ret = runMALsequence(cntxt, nmb, 1, 
nmb->stop, nstk, env /* copy result in nstk first instruction*/, q); 
 
                                        if (!ret) {
@@ -5667,8 +5666,7 @@ SQLunionfunc(Client cntxt, MalBlkPtr mb,
                                                if (!(fres = 
BATdescriptor(env->stk[q->argv[0]].val.bval)))
                                                        ret = 
createException(MAL, "sql.unionfunc", SQLSTATE(HY005) "Cannot access column 
descriptor");
                                                else {
-                                                       ccnt = BATcount(fres);
-                                                       BAT *p = 
BATconstant(fres->hseqbase, res[0]->ttype, (ptr)BUNtail(bi[0], cur), ccnt, 0);
+                                                       BAT *p = 
BATconstant(fres->hseqbase, res[0]->ttype, (ptr)BUNtail(bi[0], cur), 
BATcount(fres), TRANSIENT);
 
                                                        if (p) {
                                                                if 
(BATappend(res[0], p, NULL, FALSE) != GDK_SUCCEED)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list