Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv697/src/backends/monet5
Modified Files:
sql_optimizer.mx
Log Message:
propagated changes of Wednesday Dec 02 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/02 - sjoerd: src/backends/monet5/sql_optimizer.mx,1.230.2.11
Added NULL check for cname. This "cannot happen".
Found by Coverity.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- sql_optimizer.mx 15 Nov 2009 22:54:39 -0000 1.238
+++ sql_optimizer.mx 2 Dec 2009 13:06:00 -0000 1.239
@@ -354,7 +354,7 @@
cnt = store_funcs.count_idx(i);
assert(cnt <= (size_t) GDK_oid_max);
rows = (oid) cnt;
- } else if (s && f == bindRef) {
+ } else if (s && f == bindRef && cname) {
size_t cnt;
sql_table *t = mvc_bind_table(m, s, tname);
sql_column *c = mvc_bind_column(m, t, cname);
------------------------------------------------------------------------------
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
