Changeset: edd708018b4f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edd708018b4f
Modified Files:
sql/server/rel_optimizer.c
Branch: Dec2011
Log Message:
fix for crash on solaris
diffs (21 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
@@ -553,6 +553,8 @@ joinexp_cmp(list *rels, sql_exp *h, sql_
sql_rel *key_r = find_rel(rels, key->r);
assert (!h || !key || (h->type == e_cmp && key->type == e_cmp));
+ if (is_complex_exp(h->flag) || is_complex_exp(key->flag))
+ return -1;
if (h_l == key_l && h_r == key_r)
return 0;
if (h_r == key_l && h_l == key_r)
@@ -742,6 +744,8 @@ find_fk(sql_allocator *sa, list *rels, l
sql_idx *idx = NULL;
sql_exp *je = djn->data, *le = je->l, *re = je->r;
+ if (is_complex_exp(je->flag))
+ break;
if (!find_prop(je->p, PROP_JOINIDX)) {
int swapped = 0;
list *aaje = matching_joins(sa, rels, aje, je);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
