MonetDB: default - Merge with Jan2014 branch.

[Sjoerd Mullender]

Changeset: 410e280579f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=410e280579f0
Modified Files:
        gdk/gdk_group.c
        monetdb5/optimizer/opt_mergetable.c
        sql/server/rel_optimizer.c
        sql/storage/store.c
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (57 lines):

diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -686,7 +686,7 @@ BATgroup_internal(BAT **groups, BAT **ex
                gn->tsorted = 1;
                for (p = 0, q = BATcount(b); p < q; p++) {
                        if ((v = bgrps[w[p]]) == 0xFF && ngrp < 256) {
-                               bgrps[w[p]] = v = ngrp++;
+                               bgrps[w[p]] = v = (unsigned char) ngrp++;
                                if (extents)
                                        exts[v] = b->hseqbase + (oid) p;
                        }
@@ -709,7 +709,7 @@ BATgroup_internal(BAT **groups, BAT **ex
                gn->tsorted = 1;
                for (p = 0, q = BATcount(b); p < q; p++) {
                        if ((v = sgrps[w[p]]) == 0xFFFF && ngrp < 65536) {
-                               sgrps[w[p]] = v = ngrp++;
+                               sgrps[w[p]] = v = (unsigned short) ngrp++;
                                if (extents)
                                        exts[v] = b->hseqbase + (oid) p;
                        }
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
@@ -4621,7 +4621,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
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list