Should this have gone to the Apr2011 branch? That branch is not dead yet, we will do a Apr2011-SP2 release still.
On 2011-07-13 19:26, Niels Nes wrote: > Changeset: 6cc71eb539a4 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6cc71eb539a4 > Modified Files: > sql/server/rel_updates.c > sql/storage/store.c > Branch: Aug2011 > Log Message: > > fix bug #2835 in checking ukeys > > > diffs (25 lines): > > diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c > --- a/sql/server/rel_updates.c > +++ b/sql/server/rel_updates.c > @@ -251,7 +251,10 @@ > inserts->r = rel_label(sql, inserts->r); > for (n = t->idxs.set->h; n; n = n->next) { > sql_idx *i = n->data; > + sql_rel *ins = inserts->r; > > + if (ins->op == op_union) > + inserts->r = rel_project(sql->sa, ins, > rel_projections(sql, ins, NULL, 0, 1)); > if (hash_index(i->type) || i->type == no_idx) { > rel_insert_hash_idx(sql, i, inserts); > } else if (i->type == join_idx) { > diff --git a/sql/storage/store.c b/sql/storage/store.c > --- a/sql/storage/store.c > +++ b/sql/storage/store.c > @@ -4365,7 +4365,6 @@ > if (!k->idx->key) > k->idx->key = k; > } > - return k; > } > > /* we need to create an index */ > _______________________________________________ > Checkin-list mailing list > [email protected] > http://mail.monetdb.org/mailman/listinfo/checkin-list -- Sjoerd Mullender
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
