Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22322/src/server
Modified Files:
sql_rel2bin.mx
Log Message:
propagated changes of Thursday Nov 12 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/11/12 - nielsnes: src/server/sql_rel2bin.mx,1.139.2.1
long standing problem of pushing semijoins through relselects fixed the
problems with incorrect plans with and and or.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_rel2bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_rel2bin.mx,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- sql_rel2bin.mx 18 Aug 2009 11:41:23 -0000 1.139
+++ sql_rel2bin.mx 12 Nov 2009 08:39:43 -0000 1.140
@@ -940,13 +940,15 @@
return NULL;
}
-stmt *
-push_select_stmt( list *l, stmt *sel )
+static stmt *
+push_select_stmt( mvc *c, list *l, stmt *sel )
{
node *n;
for (n = l->h; n; n = n->next) {
- sel = push_semijoin(stmt_dup(n->data), sel);
+ stmt *s = rel2bin(c, n->data);
+
+ sel = push_semijoin(s, sel);
}
return sel;
}
@@ -1111,7 +1113,7 @@
sel = stmt_dup(n->data);
list_remove_node(l, n);
- sel = push_select_stmt(l, sel);
+ sel = push_select_stmt(c, l, sel);
res = rel2bin(c, sel);
stmt_destroy(sel);
}
------------------------------------------------------------------------------
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
