Changeset: 9aac3b62787a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aac3b62787a
Modified Files:
sql/server/rel_optimizer.c
Branch: Aug2011
Log Message:
more name fixing
diffs (17 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
@@ -2226,8 +2226,11 @@ rel_rename_exps( mvc *sql, list *exps1,
for (n = exps1->h, m = exps2->h; n && m; n = n->next, m = m->next) {
sql_exp *e1 = n->data;
sql_exp *e2 = m->data;
-
- exp_setname(sql->sa, e2, e1->rname, e1->name );
+ char *rname = e1->rname;
+
+ if (!rname && e2->rname)
+ rname = e2->rname;
+ exp_setname(sql->sa, e2, rname, e1->name );
}
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
