Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26545/src/server
Modified Files:
rel_select.mx
Log Message:
propagated changes of Thursday Dec 03 2009 - Friday Dec 04 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/03 - sjoerd: src/server/rel_select.mx,1.157.2.3
Added assertion to help Coverity.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/04 - sjoerd: src/server/rel_select.mx,1.157.2.4
Removed unnecessary test: if groupby == 0, we would have crashed a few
lines earlier already.
Found by Coverity.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- rel_select.mx 28 Nov 2009 22:56:47 -0000 1.161
+++ rel_select.mx 4 Dec 2009 14:30:42 -0000 1.162
@@ -3310,7 +3310,7 @@
return NULL;
}
- if (f == sql_where && !groupby)
+ if (f == sql_where)
return sql_error(sql, 02, "%s: not allowed in WHERE clause",
toUpperCopy(alloca(strlen(aggrstr) + 1),
aggrstr));
@@ -4087,8 +4087,10 @@
return sql_error(sql, 10, "SELECT: too many nested operators");
e = rel_value_exp2(sql, rel, se, f, ek, &is_last);
- if (e && (se->token == SQL_SELECT || se->token == SQL_TABLE) &&
!is_last)
+ if (e && (se->token == SQL_SELECT || se->token == SQL_TABLE) &&
!is_last) {
+ assert(*rel);
return rel_lastexp(sql, *rel);
+ }
return e;
}
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
