Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29861/src/server
Modified Files:
rel_semantic.mx rel_exp.mx
Log Message:
cleanup code
U rel_exp.mx
Index: rel_exp.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_exp.mx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- rel_exp.mx 19 Aug 2009 19:53:27 -0000 1.35
+++ rel_exp.mx 13 Sep 2009 11:24:03 -0000 1.36
@@ -203,12 +203,15 @@
sql_exp *
exp_or( list *l, list *r)
{
- sql_exp *e1 = l->h->data;
+ sql_exp *f = NULL;
sql_exp *e = exp_create(e_cmp);
- e->card = e1->card;
+
+ f = l->h?l->h->data:r->h?r->h->data:NULL;
+ e->card = l->h?exps_card(l):exps_card(r);
e->l = l;
e->r = r;
- e->f = e1->f;
+ assert(f);
+ e->f = f;
e->flag = cmp_or;
return e;
}
U rel_semantic.mx
Index: rel_semantic.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_semantic.mx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- rel_semantic.mx 25 Jul 2009 22:08:38 -0000 1.38
+++ rel_semantic.mx 13 Sep 2009 11:24:03 -0000 1.39
@@ -278,8 +278,7 @@
}
if (!rel_is_ref(rel))
stack_set_rel_view(sql, name, nrel);
- else
- rel_destroy(nrel);
+ rel_destroy(nrel);
}
rel = rel_semantic(sql, select);
stack_pop_frame(sql);
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
