MonetDB: Dec2016 - Correctly compare types in BATifthenelse.

[Sjoerd Mullender]

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

Correctly compare types in BATifthenelse.


diffs (12 lines):

diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -13234,7 +13234,7 @@ BATcalcifthenelse(BAT *b, BAT *b1, BAT *
                return NULL;
        if (checkbats(b, b2, "BATcalcifthenelse") != GDK_SUCCEED)
                return NULL;
-       if (b->ttype != TYPE_bit || b1->ttype != b2->ttype) {
+       if (b->ttype != TYPE_bit || ATOMtype(b1->ttype) != ATOMtype(b2->ttype)) 
{
                GDKerror("BATcalcifthenelse: \"then\" and \"else\" BATs have 
different types.\n");
                return NULL;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list