Update of /cvsroot/monetdb/sql/src/include
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9111/src/include
Modified Files:
sql_relation.h
Log Message:
propagated changes of Monday Jan 18 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/18 - sjoerd: src/include/sql_relation.h,1.42.2.1
propagated changes of Sunday Jan 17 2010 - Monday Jan 18 2010
from the Nov2009 branch to the Feb2010 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/17 - nielsnes: src/include/sql_relation.h,1.37.2.3
fixed bug in internal expression representation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_relation.h
===================================================================
RCS file: /cvsroot/monetdb/sql/src/include/sql_relation.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- sql_relation.h 10 Jan 2010 15:33:34 -0000 1.42
+++ sql_relation.h 18 Jan 2010 13:36:12 -0000 1.43
@@ -208,7 +208,7 @@
/* used for expressions and relations */
#define is_intern(e) \
- ((e->flag&EXP_INTERN))
+ (e->type != e_atom && (e->flag&EXP_INTERN))
#define set_intern(e) \
e->flag |= EXP_INTERN
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
