MonetDB: default - more protective code

[Niels Nes]

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

more protective code


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
@@ -4727,7 +4727,7 @@ rel_use_index(int *changes, mvc *sql, sq
                                        ((left && !rel_find_exp(rel->l, e->l)) 
||
                                        (!left && !rel_find_exp(rel->r, 
e->l)))) 
                                        nre = e->l;
-                               single_table = (!re || strcmp(exp_relname(nre), 
exp_relname(re)) == 0);
+                               single_table = (!re || (exp_relname(nre) && 
exp_relname(re) && strcmp(exp_relname(nre), exp_relname(re)) == 0));
                                re = nre;
                        }
                        if (single_table) { /* add PROP_HASHCOL to all column 
exps */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list