MonetDB: Jul2012 - Merge with Apr2012 branch.

[Sjoerd Mullender]

Changeset: a476cad36db6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a476cad36db6
Modified Files:
        monetdb5/modules/kernel/group.mx
Branch: Jul2012
Log Message:

Merge with Apr2012 branch.


diffs (12 lines):

diff --git a/monetdb5/modules/kernel/group.mx b/monetdb5/modules/kernel/group.mx
--- a/monetdb5/modules/kernel/group.mx
+++ b/monetdb5/modules/kernel/group.mx
@@ -1511,7 +1511,7 @@ sort_flush(var_t *off, oid *o, BUN size,
                if (ATOMvarsized(tpe)) shift = GDK_VARSHIFT;
        }
 
-       cur = base + off[0];
+       cur = base + (off[0] << shift);
        for (i=0; i < size; i++) {
                val = base + (off[i] << shift);
                if ((*cmp) (cur, val)) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list