Changeset: 45734606a35c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45734606a35c
Added Files:
sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.sql
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2020/Tests/All
Branch: Nov2019
Log Message:
Compilation fix and added test for bug 6815
diffs (37 lines):
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
@@ -5918,15 +5918,15 @@ rel_groupby_distinct(int *changes, mvc *
list *args = e->l;
sql_exp *dargs = args->h->data;
- list_append(ngbe, exp_copy(sql, dargs));
- list_append(exps, exp_copy(sql, dargs));
+ list_append(ngbe, exp_copy(sql->sa,
dargs));
+ list_append(exps, exp_copy(sql->sa,
dargs));
} else {
e = exp_ref(sql->sa, e);
append(ngbe, e);
append(exps, e);
}
if (e->type == e_aggr) /* aggregates must be
copied */
- e = exp_copy(sql, e);
+ e = exp_copy(sql->sa, e);
else
e = exp_ref(sql->sa, e);
append(nexps, e);
diff --git a/sql/test/BugTracker-2020/Tests/All
b/sql/test/BugTracker-2020/Tests/All
--- a/sql/test/BugTracker-2020/Tests/All
+++ b/sql/test/BugTracker-2020/Tests/All
@@ -1,1 +1,2 @@
median_avg-nulls.Bug-6807
+ifthenelse-crash.Bug-6815
diff --git a/sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.sql
b/sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.sql
@@ -0,0 +1,4 @@
+start transaction;
+create table t6815 (type_digits int);
+select ifthenelse((type_digits > 0), '('||type_digits||')', '') as opt_len
from t6815;
+rollback;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
