MonetDB: mtime - Merge with default branch.

[Sjoerd Mullender]

Changeset: 8ad00f7f7d3a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ad00f7f7d3a
Modified Files:
        sql/backends/monet5/rel_bin.c
        sql/server/rel_select.c
Branch: mtime
Log Message:

Merge with default branch.


diffs (25 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
@@ -582,7 +582,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
                list *l = sa_list(sql->sa), *exps = e->l;
                sql_subfunc *f = e->f;
                stmt *rows = NULL, *cond_execution = NULL;
-               char name[16], *nme;
+               char name[16], *nme = NULL;
 
                if (f->func->side_effect && left) {
                        if (!exps || list_empty(exps))
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -3337,8 +3337,7 @@ rel_unop_(sql_query *query, sql_exp *e, 
                        f = NULL;
        }
        if (f && check_card(card, f)) {
-               sql_arg *ares = f->func->res?f->func->res->h->data:NULL;
-               if (ares && ares->type.scale == INOUT) {
+               if (f->func->fix_scale == INOUT) {
                        sql_subtype *res = f->res->h->data;
                        res->digits = t->digits;
                        res->scale = t->scale;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list