MonetDB: default - initialize gpck

[Niels Nes]

Changeset: 02c271dcda5f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02c271dcda5f
Modified Files:
        monetdb5/optimizer/opt_mergetable.c
Branch: default
Log Message:

initialize gpck


diffs (23 lines):

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
@@ -1333,7 +1333,7 @@ static int
 mat_topn(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int m, int n, int o)
 {
        int tpe = getArgType(mb,p,0), k, is_slice = isSlice(p), zero = -1;
-       InstrPtr pck, gpck, q, r;
+       InstrPtr pck, gpck = NULL, q, r;
        int with_groups = (p->retc == 2), piv = 0, topn2 = (n >= 0);
 
        assert( topn2 || o < 0);
@@ -1382,9 +1382,8 @@ mat_topn(MalBlkPtr mb, InstrPtr p, mat_t
        piv = mtop;
        mtop = mat_add_var(mat, mtop, pck, p, getArg(p,0), 
is_slice?mat_slc:mat_tpn, m, n);
        mat[mtop-1].pushed = 0;
-       if (with_groups) {
+       if (with_groups)
                mtop = mat_add_var(mat, mtop, gpck, p, getArg(p,1), 
is_slice?mat_slc:mat_tpn, m, piv);
-       }
 
        if (is_slice || p->retc ==1 /* single result, ie last of the topn's */) 
{
                if (mat[m].type == mat_tpn || !is_slice) 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list