MonetDB: default - Merge with Feb2013 branch.

[Sjoerd Mullender]

Changeset: 4af0c3db74b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4af0c3db74b5
Modified Files:
        gdk/gdk_aggr.c
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (27 lines):

diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -406,7 +406,10 @@ dosum(const void *values, int nonil, oid
        if (nils == 0 && nil_if_empty) {
                /* figure out whether there were any empty groups
                 * (that result in a nil value) */
-               seen[ngrp >> 5] |= ~0U << (ngrp & 0x1F); /* fill last slot */
+               if (ngrp & 0x1F) {
+                       /* fill last slot */
+                       seen[ngrp >> 5] |= ~0U << (ngrp & 0x1F);
+               }
                for (i = 0, ngrp = (ngrp + 31) / 32; i < ngrp; i++) {
                        if (seen[i] != ~0U) {
                                nils = 1;
@@ -888,7 +891,10 @@ doprod(const void *values, oid seqb, BUN
        if (nils == 0 && nil_if_empty) {
                /* figure out whether there were any empty groups
                 * (that result in a nil value) */
-               seen[ngrp >> 5] |= ~0U << (ngrp & 0x1F); /* fill last slot */
+               if (ngrp & 0x1F) {
+                       /* fill last slot */
+                       seen[ngrp >> 5] |= ~0U << (ngrp & 0x1F);
+               }
                for (i = 0, ngrp = (ngrp + 31) / 32; i < ngrp; i++) {
                        if (seen[i] != ~0U) {
                                nils = 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list