Changeset: 3e237ae16358 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e237ae16358
Modified Files:
        sql/server/rel_optimizer.c
        
sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.stable.out
Branch: Jul2015
Log Message:

fixed bug 3854


diffs (26 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
@@ -3363,7 +3363,9 @@ rel_push_select_down(int *changes, mvc *
                        /* add inplace empty select */
                        sql_rel *l = rel_select(sql->sa, rel->l, NULL);
 
-                       l->exps = rel->exps;
+                       if (!l->exps)
+                               l->exps = sa_list(sql->sa);
+                       (void)list_merge(l->exps, rel->exps, (fdup)NULL);
                        rel->exps = NULL;
                        rel->l = l;
                        (*changes)++;
diff --git 
a/sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.stable.out 
b/sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.stable.out
--- 
a/sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.stable.out
+++ 
b/sql/test/BugTracker-2015/Tests/expression_with_comparison.Bug-3854.stable.out
@@ -71,7 +71,7 @@ Ready.
 #      AND ((FALSE AND (TRUE OR FALSE))
 #        OR (15 > t.foo)
 #      );
-% sys.t,       sys.t # table_name
+% .t,  .t # table_name
 % id,  foo # name
 % int, int # type
 % 1,   1 # length
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to