Changeset: c6ecde52f069 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c6ecde52f069
Modified Files:
        gdk/gdk_join.c
Branch: default
Log Message:

make sure we properly flag for nil's (do not overwrite but use or-ing)


diffs (21 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2881,7 +2881,7 @@ mergejoin(BAT **r1p, BAT **r2p, BAT **r3
                                                APPEND(r2, oid_nil);    \
                                        }                               \
                                        if (r3) {                       \
-                                               r3->tnil = mark == bit_nil; \
+                                               r3->tnil |= mark == bit_nil; \
                                                ((bit *) 
r3->theap->base)[r3->batCount++] = mark; \
                                        }                               \
                                } else if (min_one) {                   \
@@ -3236,7 +3236,7 @@ hashjoin(BAT **r1p, BAT **r2p, BAT **r3p
                                                APPEND(r2, oid_nil);
                                        }
                                        if (r3) {
-                                               r3->tnil = mark == bit_nil;
+                                               r3->tnil |= mark == bit_nil;
                                                ((bit *) 
r3->theap->base)[r3->batCount++] = mark;
                                        }
                                } else if (min_one) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to