Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15754/src/server
Modified Files:
rel_bin.mx sql_select.mx
Log Message:
propagated changes of Friday Mar 21 2008 - Friday Mar 21 2008
from the SQL_2-22 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/21 - nielsnes: src/test/BugTracker/Tests/All,1.80.2.9
src/test/BugTracker/Tests/count_crash.SF-1918780.sql,1.1.2.1
src/test/BugTracker/Tests/count_crash.SF-1918780.stable.err,1.1.2.1
src/test/BugTracker/Tests/count_crash.SF-1918780.stable.out,1.1.2.1
added test + stable output for bug
1918780 Monet Server down with malformed sql statement
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/21 - nielsnes: src/server/rel_bin.mx,1.33.2.1
src/server/sql_select.mx,1.219.2.9
fixed bug (handle atom in aggr expression())
1918780 Monet Server down with malformed sql statement
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/21 - nielsnes: src/test/BugTracker/Tests/All,1.80.2.10
added test script and stable output
for bug 1913572 column from a table function
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_bin.mx,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- rel_bin.mx 8 Mar 2008 07:27:00 -0000 1.37
+++ rel_bin.mx 21 Mar 2008 08:41:28 -0000 1.38
@@ -229,6 +229,9 @@
}
if (!as)
return NULL;
+
+ if (as->nrcols <= 0 && left)
+ as = stmt_const(bin_first_column(left), as);
/* inconsistent sql requires NULL != NULL and NULL <> NULL, ie
unknown
* but also NULL means no values, which means 'ignore'
*
Index: sql_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_select.mx,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- sql_select.mx 14 Mar 2008 12:55:22 -0000 1.226
+++ sql_select.mx 21 Mar 2008 08:41:28 -0000 1.227
@@ -1202,6 +1202,8 @@
/* the values which are aggregated together, no grp should
* be given there to optain the values */
s = sql_value_exp(sql, scp, l->h->next->next->data.sym, /*grp
*/ NULL, subset, f, ek);
+ if (s->nrcols <= 0 && subset) /* single value */
+ s = stmt_const(first_subset(subset), s);
}
if (s && distinct) {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
