MonetDB: int128 - Merge with default branch.

[Stefan Manegold]

Changeset: 1d405c86ec19 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d405c86ec19
Modified Files:
        monetdb5/modules/mal/manifold.c
        monetdb5/optimizer/opt_pushselect.c
        sql/backends/monet5/sql_gencode.c
Branch: int128
Log Message:

Merge with default branch.


diffs (44 lines):

diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -136,7 +136,7 @@ MANIFOLDjob(MULTItask *mut)
 {      int i;
        char *p, *q;
        char **args;
-       str y, msg= MAL_SUCCEED;
+       str y = NULL, msg= MAL_SUCCEED;
 
        args = (char**) GDKzalloc(sizeof(char*) * mut->pci->argc);
        if( args == NULL)
@@ -174,6 +174,8 @@ MANIFOLDjob(MULTItask *mut)
        default:
                msg= createException(MAL,"mal.manifold","manifold call 
limitation ");
        }
+       if (ATOMextern(mut->args[0].type) && y) 
+               GDKfree(y); 
 bunins_failed:
        GDKfree(args);
        return msg;
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
@@ -1006,8 +1006,8 @@ static int
                                        return -1;
                                c = k;
                        }
-                       if (s->flag) {
-                               int topn = 0, flag = s->flag, utopn = flag & 2;
+                       if (s->flag&1) {
+                               int topn = 0, flag = s->flag, grps = flag & 2;
 
                                flag >>= 2;
 
@@ -1019,7 +1019,7 @@ static int
                                topn = getDestVar(q);
 
                                q = newStmt(mb, algebraRef, firstnRef);
-                               if (utopn)
+                               if (grps) /* we need the groups for the next 
firstn */
                                        q = pushReturn(mb, q, 
newTmpVariable(mb, TYPE_any));
                                q = pushArgument(mb, q, c);
                                if (p)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list