Update of /cvsroot/monetdb/MonetDB5/src/optimizer
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6822
Modified Files:
opt_support.mx
Log Message:
sql.resultSet is a side affect operator, (it changes the mvc structure)
Index: opt_support.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_support.mx,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- opt_support.mx 8 Mar 2008 18:21:46 -0000 1.63
+++ opt_support.mx 12 Mar 2008 12:41:31 -0000 1.64
@@ -1115,11 +1115,10 @@
getModuleId(p) == alarmRef)
return TRUE;
- if( getModuleId(p) == sqlRef){
- if( getFunctionId(p) == bindRef) return FALSE;
- if( getFunctionId(p) == bindidxRef) return FALSE;
- if( getFunctionId(p) == binddbatRef) return FALSE;
- if( getFunctionId(p) == resultSetRef) return FALSE;
+ if (getModuleId(p) == sqlRef){
+ if (getFunctionId(p) == bindRef) return FALSE;
+ if (getFunctionId(p) == bindidxRef) return FALSE;
+ if (getFunctionId(p) == binddbatRef) return FALSE;
return TRUE;
}
if( getModuleId(p) == languageRef){
@@ -1136,7 +1135,7 @@
if( getFunctionId(p) == disconnectRef)
return TRUE;
}
- if (strict && getFunctionId(p)==newRef)
+ if (strict && getModuleId(p) != groupRef && getFunctionId(p)==newRef)
return TRUE;
return FALSE;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
