Update of /cvsroot/monetdb/MonetDB5/src/optimizer
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26016
Modified Files:
opt_macro.mx
Log Message:
Removing left over bug of the RETURN/YIELD normalization step.
Index: opt_macro.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_macro.mx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- opt_macro.mx 27 Dec 2007 10:36:16 -0000 1.25
+++ opt_macro.mx 27 Dec 2007 13:23:22 -0000 1.26
@@ -437,10 +437,11 @@
q->argv[i] = mvar[j];
break;
}
+ /* take the return expression and match the variables*/
rq = getInstrPtr(mc, mc->stop - 2);
for (i = 0; i < rq->retc; i++)
for (j = 0; j < ctop; j++)
- if (rq->argv[i] == cvar[j]) {
+ if (rq->argv[i+rq->retc] == cvar[j]) {
q->argv[i] = mvar[j];
break;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
