Update of /cvsroot/monetdb/MonetDB4/src/modules/plain
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16759/src/modules/plain
Modified Files:
algebra.mx
Log Message:
propagated changes of Friday Mar 07 2008 - Monday Mar 17 2008
from the MonetDB_4-22 branch to the development trunk
===================================================================
2008/03/14 - nielsnes: src/modules/plain/algebra.mx,1.10.2.2
src/modules/plain/Tests/aggr.stable.out.64bit,1.1.10.1
src/modules/plain/Tests/aggrX3.stable.out.64bit,1.1.10.1
sum now returns NULL for empty bats
===================================================================
Index: algebra.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/algebra.mx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- algebra.mx 6 Mar 2008 08:29:21 -0000 1.12
+++ algebra.mx 17 Mar 2008 09:30:28 -0000 1.13
@@ -1362,6 +1362,8 @@
@2 [EMAIL PROTECTED];
BATcheck(b,"[EMAIL PROTECTED]@2");
+ if (!BATcount(b))
+ result = @2_nil;
BATloop(b, p, q) {
@1 *value = (@1*) BUNtloc(bi, p);
if (*value == @1_nil) {
@@ -1389,6 +1391,8 @@
@2 [EMAIL PROTECTED];
BATcheck(b,"BATprodInt");
+ if (!BATcount(b))
+ result = @2_nil;
BATloop(b, p, q) {
@1 *value = (@1*) BUNtloc(bi, p);
if (*value == @1_nil) {
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
