MonetDB: default - Merge with Jan2014 branch.

[Sjoerd Mullender]

Changeset: 3064aa9cb4fc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3064aa9cb4fc
Modified Files:
        sql/server/rel_select.c
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (12 lines):

diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2410,7 +2410,7 @@ rel_or(mvc *sql, sql_rel *l, sql_rel *r,
                return l;
        }
 
-       if (l->op == r->op && ll == rl) {
+       if (l->op == r->op && ll == rl && l->r == r->r) {
                sql_exp *e = exp_or(sql->sa, l->exps, r->exps);
                list *nl = new_exp_list(sql->sa); 
                
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list