Changeset: 78c07abcff06 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78c07abcff06
Modified Files:
sql/server/rel_psm.c
Branch: Jun2020
Log Message:
Cherry picked changeset 73d03b825885 fix into Jun2020
diffs (28 lines):
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -672,8 +672,10 @@ sequential_block (sql_query *query, sql_
case SQL_TRUNCATE:
case SQL_MERGE: {
sql_rel *r = rel_updates(query, s);
- if (!r)
+ if (!r) {
+ stack_pop_frame(sql);
return NULL;
+ }
res = exp_rel(sql, r);
} break;
default:
@@ -1310,8 +1312,11 @@ create_trigger(sql_query *query, dlist *
if (old_name)
stack_update_rel_view(sql, old_name,
new_name?rel_dup(rel):rel);
}
- if (!(sq = sequential_block(query, NULL, NULL, stmts, NULL, 1)))
+ if (!(sq = sequential_block(query, NULL, NULL, stmts, NULL, 1))) {
+ if (!instantiate)
+ stack_pop_frame(sql);
return NULL;
+ }
r = rel_psm_block(sql->sa, sq);
if (!instantiate)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
