Changeset: 368f134580e5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/368f134580e5
Modified Files:
sql/backends/monet5/rel_bin.c
Branch: default
Log Message:
Don't use uninitialized variables.
diffs (26 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -5925,12 +5925,16 @@ rel2bin_merge(backend *be, sql_rel *rel,
if (is_ddl(r->op)) {
assert(r->flag == ddl_list);
- if (r->l && !(ns = rel2bin_merge_apply_update(be, join, r->l,
refs, bt_stmt, target_stmt, jl, jr, ld, &rd)))
- return NULL;
- list_append(slist, ns);
- if (r->r && !(ns = rel2bin_merge_apply_update(be, join, r->r,
refs, bt_stmt, target_stmt, jl, jr, ld, &rd)))
- return NULL;
- list_append(slist, ns);
+ if (r->l) {
+ if ((ns = rel2bin_merge_apply_update(be, join, r->l,
refs, bt_stmt, target_stmt, jl, jr, ld, &rd)) == NULL)
+ return NULL;
+ list_append(slist, ns);
+ }
+ if (r->r) {
+ if ((ns = rel2bin_merge_apply_update(be, join, r->r,
refs, bt_stmt, target_stmt, jl, jr, ld, &rd)) == NULL)
+ return NULL;
+ list_append(slist, ns);
+ }
} else {
if (!(ns = rel2bin_merge_apply_update(be, join, r, refs,
bt_stmt, target_stmt, jl, jr, ld, &rd)))
return NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
