Changeset: 86cb2d8b2a70 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86cb2d8b2a70
Modified Files:
gdk/gdk_calc_compare.h
Branch: Jun2016
Log Message:
Don't treat TYPE_oid as TYPE_int/TYPE_lng in comparisons.
This fixes bug 6126.
diffs (16 lines):
diff --git a/gdk/gdk_calc_compare.h b/gdk/gdk_calc_compare.h
--- a/gdk/gdk_calc_compare.h
+++ b/gdk/gdk_calc_compare.h
@@ -648,10 +648,10 @@ BATcalcop(BAT *b1, BAT *b2, BAT *s)
return BATconstant(b1->hseqbase, TYPE_TPE, &res, cnt,
TRANSIENT);
}
- bn = BATcalcop_intern(b1->T->type == TYPE_void ? (void *) &b1->T->seq :
(void *) Tloc(b1, b1->batFirst), ATOMbasetype(b1->T->type), 1,
+ bn = BATcalcop_intern(b1->T->type == TYPE_void ? (void *) &b1->T->seq :
(void *) Tloc(b1, b1->batFirst), ATOMtype(b1->ttype) == TYPE_oid ? b1->ttype :
ATOMbasetype(b1->T->type), 1,
b1->T->vheap ? b1->T->vheap->base : NULL,
b1->T->width,
- b2->T->type == TYPE_void ? (void *) &b2->T->seq :
(void *) Tloc(b2, b2->batFirst), ATOMbasetype(b2->T->type), 1,
+ b2->T->type == TYPE_void ? (void *) &b2->T->seq :
(void *) Tloc(b2, b2->batFirst), ATOMtype(b2->ttype) == TYPE_oid ? b2->ttype :
ATOMbasetype(b2->T->type), 1,
b2->T->vheap ? b2->T->vheap->base : NULL,
b2->T->width,
cnt, start, end, cand, candend, b1->hseqbase,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
