MonetDB: default - Merge with Oct2012 branch.

[Sjoerd Mullender]

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

Merge with Oct2012 branch.


diffs (17 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2196,10 +2196,9 @@ BATseqbase(BAT *b, oid o)
                /* adapt keyness */
                if (BAThvoid(b)) {
                        if (o == oid_nil) {
-                               if (b->hkey)
-                                       b->hkey = FALSE;
-                               b->H->nonil = 0;
-                               b->H->nil = 1;
+                               b->hkey = b->U->count <= 1;
+                               b->H->nonil = b->U->count == 0;
+                               b->H->nil = b->U->count > 0;
                                b->hsorted = b->hrevsorted = 1;
                        } else {
                                if (!b->hkey) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list