MonetDB: mutation - merge with default

[gawade]

Changeset: 8c4f974de5b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c4f974de5b4
Modified Files:
        monetdb5/optimizer/opt_evaluate.c
Branch: mutation
Log Message:

merge with default


diffs (19 lines):

diff --git a/monetdb5/optimizer/opt_evaluate.c 
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -177,7 +177,6 @@ OPTevaluateImplementation(Client cntxt, 
                // we limit ourselfs to evaluation of the first assignment only.
                setonce = assigned[getArg(p,0)] == 1;
                OPTDEBUGevaluate printInstruction(cntxt->fdout, mb, 0, p, 
LIST_MAL_ALL);
-               constantblock +=  blockStart(p) && OPTallConstant(cntxt,mb,p);
 
                /* be aware that you only assign once to a variable */
                if (setonce && p->retc == 1 && OPTallConstant(cntxt, mb, p) && 
!isUnsafeFunction(p)) {
@@ -230,6 +229,7 @@ OPTevaluateImplementation(Client cntxt, 
                                mb->errors = 0;
                        }
                }
+               constantblock +=  blockStart(p) && OPTallConstant(cntxt,mb,p);
        }
        if ( constantblock )
                actions += OPTremoveUnusedBlocks(cntxt, mb);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list