MonetDB: default - Merge with Jul2015 branch.

[Sjoerd Mullender]

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

Merge with Jul2015 branch.


diffs (12 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1518,7 +1518,7 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT 
                        }
                        if (lcand &&
                            nl > 1 &&
-                           lcand[-1] != lcand[-1 - nl] + nl) {
+                           lcand[-1] != lcand[-1 - (ssize_t) nl] + nl) {
                                /* not all values in the range are
                                 * candidates */
                                lskipped = 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list