Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30349/src/server
Modified Files:
rel_select.mx
Log Message:
forward port fix (shouldn't conflict with later propagation)
fixes or handling
U rel_select.mx
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- rel_select.mx 7 Aug 2009 21:24:48 -0000 1.155
+++ rel_select.mx 23 Aug 2009 06:17:02 -0000 1.156
@@ -1003,9 +1003,9 @@
/* filter on columns of this relation */
if ((lrel == rrel && lrel->op != op_join) || rel_is_ref(p)) {
- if (lrel->op == op_select) {
+ if (lrel->op == op_select && !rel_is_ref(lrel)) {
rel_select_add_exp(lrel, e);
- } else if (p && p->op == op_select) {
+ } else if (p && p->op == op_select && !rel_is_ref(p)) {
rel_select_add_exp(p, e);
} else {
sql_rel *n = rel_select(lrel, e);
@@ -2019,7 +2019,7 @@
rel->exps = rel_projections(sql, rel, NULL, 1, 1);
rel = rel_distinct(rel);
if (exps_card(l->exps) <= CARD_AGGR &&
- exps_card(r->exps) <= CARD_AGGR)
+ exps_card(r->exps) <= CARD_AGGR)
{
rel->card = exps_card(l->exps);
exps_fix_card( rel->exps, rel->card);
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
