Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9612/src/server
Modified Files:
rel_bin.mx
Log Message:
propagated changes of Tuesday Oct 06 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/06 - sjoerd: src/server/rel_bin.mx,1.93.2.1
propagated changes of Monday Oct 05 2009 - Tuesday Oct 06 2009
from the Aug2009 branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/05 - nielsnes: src/server/rel_bin.mx,1.87.2.6
add test and fixed bug in IN handling
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_bin.mx,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- rel_bin.mx 21 Sep 2009 14:13:35 -0000 1.93
+++ rel_bin.mx 6 Oct 2009 13:40:23 -0000 1.94
@@ -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
