MonetDB: default - merged with Jun2016

[Niels Nes]

Changeset: 67cb168022d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=67cb168022d1
Modified Files:
        monetdb5/optimizer/opt_deadcode.c
        monetdb5/optimizer/opt_remap.c
Branch: default
Log Message:

merged with Jun2016


diffs (34 lines):

diff --git a/monetdb5/optimizer/opt_deadcode.c 
b/monetdb5/optimizer/opt_deadcode.c
--- a/monetdb5/optimizer/opt_deadcode.c
+++ b/monetdb5/optimizer/opt_deadcode.c
@@ -76,7 +76,7 @@ OPTdeadcodeImplementation(Client cntxt, 
        
        // Now we can simply copy the intructions and discard useless ones.
        pushInstruction(mb, old[0]);
-       for (i = 1; i < limit; i++) 
+       for (i = 1; i < limit; i++) {
                if ((p = old[i]) != NULL) {
                        if( p->token == ENDsymbol){
                                pushInstruction(mb,p);
@@ -99,6 +99,7 @@ OPTdeadcodeImplementation(Client cntxt, 
                                actions ++;
                        }
                }
+       }
        for(; i<slimit; i++)
                if( old[i])
                        freeInstruction(old[i]);
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -451,8 +451,8 @@ OPTremapImplementation(Client cntxt, Mal
                }
        }
        for(; i<slimit; i++)
-       if( old[i])
-               freeInstruction(old[i]);
+               if( old[i])
+                       freeInstruction(old[i]);
        GDKfree(old);
        OPTDEBUGremap
        if (doit){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list