MonetDB: Oct2012 - Merge with Jul2012 branch.

[Sjoerd Mullender]

Changeset: fdf38d85b5cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fdf38d85b5cd
Modified Files:
        monetdb5/optimizer/opt_groups.c
Branch: Oct2012
Log Message:

Merge with Jul2012 branch.


diffs (42 lines):

diff --git a/monetdb5/optimizer/opt_groups.c b/monetdb5/optimizer/opt_groups.c
--- a/monetdb5/optimizer/opt_groups.c
+++ b/monetdb5/optimizer/opt_groups.c
@@ -28,22 +28,16 @@ OPTgroupsImplementation(Client cntxt, Ma
        InstrPtr q;
        InstrPtr *old;
        int limit,slimit;
-       Lifespan span;
 
        (void) cntxt;
        (void) stk;
-       span= setLifespan(mb);
-       if( span == NULL)
-               return 0;
        if (varGetProp(mb, getArg(mb->stmt[0], 0), inlineProp) != NULL) {
-               GDKfree(span);
                return 0;
        }
 
        /* beware, new variables and instructions are introduced */
        pc= (int*) GDKzalloc(sizeof(int)* mb->vtop * 2); /* to find last 
assignment */
        if ( pc == NULL) {
-               GDKfree(span);
                return 0;
        }
 
@@ -51,7 +45,6 @@ OPTgroupsImplementation(Client cntxt, Ma
        limit= mb->stop;
        slimit= mb->ssize;
        if ( newMalBlkStmt(mb,mb->ssize) <0) {
-               GDKfree(span);
                GDKfree(pc);
                return 0;
        }
@@ -96,7 +89,6 @@ OPTgroupsImplementation(Client cntxt, Ma
                        freeInstruction(old[i]);
        GDKfree(old);
        GDKfree(pc);
-       GDKfree(span);
        DEBUGoptimizers
                mnstr_printf(cntxt->fdout,"#opt_groups: %d statements 
glued\n",actions);
        return actions;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list