Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2337/src/server
Modified Files:
sql_select.mx
Log Message:
propagated changes of Sunday Feb 24 2008 - Thursday Feb 28 2008
from the SQL_2-22 branch to the development trunk
NOTE:
There were CONFLICTS in src/server/sql_select.mx .
I hope, I solved by correctly --- basically by using the version from the
SQL_2-22 branch...
Please double-check!
Index: sql_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_select.mx,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- sql_select.mx 25 Feb 2008 19:07:43 -0000 1.222
+++ sql_select.mx 28 Feb 2008 15:56:44 -0000 1.223
@@ -2677,17 +2677,17 @@
return NULL;
/* flatten subqueries */
- if (s->type == st_list && list_length(s->op1.lval) == 2 && f ==
sql_sel) {
+ if (s->type == st_list &&
+ list_length(s->op1.lval) == 2 && f == sql_sel) {
stmt *h, *v = stmt_dup(s->op1.lval->h->data);
stmt *o = stmt_dup(s->op1.lval->h->next->data);
-
stmt_destroy(s);
s = stmt_join(stmt_reverse(o), v, cmp_equal);
h = stmt_dup(s->h->t);
stmt_destroy(s->h);
s->h = h;
- /* make sure we don't lose rows */
- s = stmt_outerjoin(stmt_mirror(first_subset(subset)), s,
cmp_equal);
+ if (f >= sql_sel) /* make sure we don't lose rows */
+ s = stmt_outerjoin(stmt_mirror(first_subset(subset)),
s, cmp_equal);
}
/* AS name */
if (s && l->h->next->data.sval) {
-------------------------------------------------------------------------
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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
