Changeset: cd645a249250 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd645a249250
Modified Files:
monetdb5/modules/mal/pcre.c
Branch: default
Log Message:
one more bat_nil fix
diffs (15 lines):
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1694,9 +1694,9 @@ PCREsubjoin(bat *r1, bat *r2, bat lid, b
goto fail;
if ((right = BATdescriptor(rid)) == NULL)
goto fail;
- if (slid && (candleft = BATdescriptor(slid)) == NULL)
+ if (slid != bat_nil && (candleft = BATdescriptor(slid)) == NULL)
goto fail;
- if (srid && (candright = BATdescriptor(srid)) == NULL)
+ if (srid != bat_nil && (candright = BATdescriptor(srid)) == NULL)
goto fail;
result1 = BATnew(TYPE_void, TYPE_oid, BATcount(left), TRANSIENT);
result2 = BATnew(TYPE_void, TYPE_oid, BATcount(left), TRANSIENT);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
