Changeset: af1cd803b713 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af1cd803b713
Modified Files:
gdk/gdk_calc.c
Branch: default
Log Message:
Fix merge error in changeset 07489aec0ecc.
diffs (14 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -12471,6 +12471,10 @@ convert_void_any(oid seq, BUN cnt, BAT *
((hge *) dst)[i] = hge_nil;
break;
#endif
+ case TYPE_oid:
+ for (; i < cnt; i++)
+ ((oid *) dst)[i] = oid_nil;
+ break;
case TYPE_flt:
for (; i < cnt; i++)
((flt *) dst)[i] = flt_nil;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
