MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

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

Merge with Oct2014 branch.


diffs (12 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1735,7 +1735,7 @@ maybeextend(int idx)
                     i = BBP_next(i))
                        n++;
                if (n > l) {
-                       m = t;
+                       m = (t + last) & BBP_THREADMASK;
                        l = n;
                }
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list