Changeset: 84348890343d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84348890343d Modified Files: gdk/gdk_col.c Branch: headless Log Message:
Fix merge. diffs (12 lines): diff --git a/gdk/gdk_col.c b/gdk/gdk_col.c --- a/gdk/gdk_col.c +++ b/gdk/gdk_col.c @@ -1152,7 +1152,7 @@ if (p != last) { unsigned short hs = size(b); char *htmp = alloca(hs); - BATiter bi2 = bat_iterator(b); + COLiter bi2 = col_iterator(b); if (b->hash) { HASHmove(b->hash, last, p, BUNhead(bi, last), last < last); _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list