Changeset: aaf264c72b6e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aaf264c72b6e
Modified Files:
sql/server/rel_updates.c
sql/storage/store.c
Branch: Apr2011
Log Message:
fix bug #2835 in checking ukeys
(transplanted from 6cc71eb539a4d8e5fa3b7bb442d68ab647d1f7ad)
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
@@ -254,7 +254,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
@@ -4357,7 +4357,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
