Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17322/src/server
Modified Files:
Tag: Aug2009
rel_bin.mx
Log Message:
add test and fixed bug in IN handling
U rel_bin.mx
Index: rel_bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_bin.mx,v
retrieving revision 1.87.2.5
retrieving revision 1.87.2.6
diff -u -d -r1.87.2.5 -r1.87.2.6
--- rel_bin.mx 19 Sep 2009 18:53:34 -0000 1.87.2.5
+++ rel_bin.mx 5 Oct 2009 20:43:28 -0000 1.87.2.6
@@ -174,9 +174,9 @@
are_equality_exps( list *exps )
{
if (list_length(exps) == 1) {
- sql_exp *e = exps->h->data;
+ sql_exp *e = exps->h->data, *re = e->r;
- if (e->type == e_cmp && e->flag == cmp_equal)
+ if (e->type == e_cmp && e->flag == cmp_equal && re->card ==
CARD_ATOM)
return 1;
if (e->type == e_cmp && e->flag == cmp_or)
return (are_equality_exps(e->l) &&
@@ -188,9 +188,9 @@
static void
get_exps( list *n, list *l )
{
- sql_exp *e = l->h->data;
+ sql_exp *e = l->h->data, *re = e->r;
- if (e->type == e_cmp && e->flag == cmp_equal)
+ if (e->type == e_cmp && e->flag == cmp_equal && re->card == CARD_ATOM)
list_append(n, exp_dup(e));
if (e->type == e_cmp && e->flag == cmp_or) {
get_exps(n, e->l);
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
