MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

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

Merge with Oct2014 branch.


diffs (18 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1200,12 +1200,12 @@ BUNins(BAT *b, const void *h, const void
                }
 
                if (b->H->hash) {
-                       HASHins(b, p, h);
+                       HASHins(bm, p, h);
                        if (hsize && hsize != b->H->vheap->size)
                                HEAPwarm(b->H->vheap);
                }
                if (b->T->hash) {
-                       HASHins(bm, p, t);
+                       HASHins(b, p, t);
                        if (tsize && tsize != b->T->vheap->size)
                                HEAPwarm(b->T->vheap);
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list