Changeset: fa87f4bfac34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa87f4bfac34
Modified Files:
sql/server/rel_dump.c
sql/server/rel_optimizer.c
Branch: Jul2017
Log Message:
merged with Dec2016
diffs (27 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -1182,7 +1182,9 @@ rel_read(mvc *sql, char *r, int *pos, li
gexps = read_exps(sql, nrel, NULL, NULL, r, pos, '[', 0);
skipWS(r, pos);
- exps = read_exps(sql, nrel, NULL, NULL, r, pos, '[', 1);
+ exps = read_exps(sql, nrel, NULL, gexps, r, pos, '[', 1);
+ if (!exps)
+ return NULL;
rel = rel_groupby(sql, nrel, gexps);
rel->exps = exps;
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
@@ -2461,7 +2461,8 @@ static sql_exp *
math_unsafe_fixup( mvc *sql, sql_exp *e, sql_exp *cond, int lr )
{
list *args = e->l;
- if (args->h->next)
+
+ if (args && args->h && args->h->next)
return math_unsafe_fixup_binop(sql, e, args->h->data,
args->h->next->data, cond, lr);
else
return math_unsafe_fixup_unop(sql, e, args->h->data, cond, lr);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
