MonetDB: default - merging

[Niels Nes]

Changeset: ee1466926f3f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee1466926f3f
Modified Files:
        monetdb5/optimizer/opt_support.mx
Branch: default
Log Message:

merging


diffs (13 lines):

diff --git a/monetdb5/optimizer/opt_support.mx 
b/monetdb5/optimizer/opt_support.mx
--- a/monetdb5/optimizer/opt_support.mx
+++ b/monetdb5/optimizer/opt_support.mx
@@ -1405,7 +1405,8 @@
 and should be conservative.
 @c
 int isMapOp(InstrPtr p){
-       return  (getModuleId(p)== batcalcRef && getFunctionId(p) != mark_grpRef 
&& getFunctionId(p) != rank_grpRef) ||
+       return  (getModuleId(p) == multiplexRef) ||
+               (getModuleId(p)== batcalcRef && getFunctionId(p) != mark_grpRef 
&& getFunctionId(p) != rank_grpRef) ||
                (getModuleId(p)== batmtimeRef) ||
                (getModuleId(p)== batstrRef) ||
                (getModuleId(p)== mkeyRef); 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list