Changeset: e5d37fb4f523 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5d37fb4f523
Modified Files:
monetdb5/optimizer/opt_mergetable.c
sql/server/rel_optimizer.c
sql/storage/store.c
Branch: int128
Log Message:
Merge with Jan2014 branch.
diffs (36 lines):
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1175,7 +1175,7 @@ mat_group_derive(MalBlkPtr mb, InstrPtr
if (getFunctionId(p) == subgroupdoneRef)
push = 1;
- if (mat[g].im == -1){ /* allready packed */
+ if (mat[g].im == -1){ /* already packed */
pushInstruction(mb, copyInstruction(p));
return mtop;
}
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -3680,7 +3680,7 @@ rel_push_select_down_union(int *changes,
static sql_rel *
rel_push_project_down_union(int *changes, mvc *sql, sql_rel *rel)
{
- /* first remove distinct if allready unique */
+ /* first remove distinct if already unique */
if (rel->op == op_project && need_distinct(rel) && rel->exps &&
exps_unique(rel->exps))
set_nodistinct(rel);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4626,7 +4626,7 @@ sql_trans_drop_idx(sql_trans *tr, sql_sc
node *n = list_find_base_id(s->idxs, id);
sql_idx *i;
- if (!n) /* allready dropped */
+ if (!n) /* already dropped */
return;
i = n->data;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
