Changeset: 1948c52a3545 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1948c52a3545
Modified Files:
gdk/gdk_join.c
Branch: default
Log Message:
Make sure variables are initialized.
diffs (29 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -307,6 +307,8 @@ selectjoin(BAT **r1p, BAT **r2p, BAT *l,
BATiter li = bat_iterator(l);
const void *v;
BAT *bn = NULL;
+ BAT *r1 = NULL;
+ BAT *r2 = NULL;
BUN bncount;
assert(lci->ncand > 0);
@@ -358,7 +360,7 @@ selectjoin(BAT **r1p, BAT **r2p, BAT *l,
goto bailout;
}
}
- BAT *r1 = COLnew(0, TYPE_oid, lci->ncand * bncount, TRANSIENT);
+ r1 = COLnew(0, TYPE_oid, lci->ncand * bncount, TRANSIENT);
if (r1 == NULL)
goto bailout;
r1->tsorted = true;
@@ -367,7 +369,6 @@ selectjoin(BAT **r1p, BAT **r2p, BAT *l,
r1->tkey = bncount == 1;
r1->tnil = false;
r1->tnonil = true;
- BAT *r2 = NULL;
if (bn == NULL) {
/* left outer join, no match, we're returning nil in r2 */
oid *o1p = (oid *) Tloc(r1, 0);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
