MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

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

Merge with Oct2010 branch.


diffs (38 lines):

diff -r 6001b1afcc9c -r cc0094447369 sql/src/server/rel_optimizer.c
--- a/sql/src/server/rel_optimizer.c    Thu Nov 04 19:14:05 2010 +0100
+++ b/sql/src/server/rel_optimizer.c    Fri Nov 05 09:27:23 2010 +0100
@@ -2391,9 +2391,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);
+                                                       }
                                                }
                                        }
                                }
diff -r 6001b1afcc9c -r cc0094447369 sql/src/server/rel_optimizer.mx
--- a/sql/src/server/rel_optimizer.mx   Thu Nov 04 19:14:05 2010 +0100
+++ b/sql/src/server/rel_optimizer.mx   Fri Nov 05 09:27:23 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
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list