MonetDB: Jul2015 - Don't merge if there is no expression.

[Sjoerd Mullender]

Changeset: 907dd705fc75 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=907dd705fc75
Modified Files:
        sql/server/rel_optimizer.c
Branch: Jul2015
Log Message:

Don't merge if there is no expression.
This fixes bug 3829.
Niels, please take a look.


diffs (12 lines):

diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -3377,7 +3377,7 @@ rel_push_select_down(int *changes, mvc *
 
        /* merge 2 selects */
        r = rel->l;
-       if (is_select(rel->op) && r && is_select(r->op) && !(rel_is_ref(r))) {
+       if (is_select(rel->op) && r && r->exps && is_select(r->op) && 
!(rel_is_ref(r))) {
                (void)list_merge(r->exps, rel->exps, (fdup)NULL);
                rel->l = NULL;
                rel_destroy(rel);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list