Changeset: a95602ba94dc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a95602ba94dc
Modified Files:
        sql/src/server/rel_optimizer.mx
Branch: Oct2010
Log Message:

In rel_push_join_down we now correctly check if the expression can
be pushed down. This solves the crash of bug 2694


diffs (19 lines):

diff -r 55e675435877 -r a95602ba94dc sql/src/server/rel_optimizer.mx
--- a/sql/src/server/rel_optimizer.mx   Thu Nov 04 16:53:31 2010 +0100
+++ b/sql/src/server/rel_optimizer.mx   Thu Nov 04 21:49:49 2010 +0100
@@ -2407,9 +2407,12 @@
                                                }
                                                if (fnd) {
                                                        sql_exp *re = 
exp_push_down(sql, r, gb, gb->l);
-                                                       assert(re);
-                                                       je = 
exp_compare(exp_dup(je->l), re, je->flag);
-                                                       list_append(jes, je);
+                                                       if (!re) {
+                                                               fnd = 0;
+                                                       } else {
+                                                               je = 
exp_compare(exp_dup(je->l), re, je->flag);
+                                                               
list_append(jes, je);
+                                                       }
                                                }
                                        }
                                }
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to