Changeset: 5ed5735a81cd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ed5735a81cd
Modified Files:
monetdb5/mal/Tests/tst670.stable.err
monetdb5/mal/Tests/tst670.stable.out
sql/server/rel_updates.c
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (49 lines):
diff --git a/monetdb5/mal/Tests/tst670.stable.err
b/monetdb5/mal/Tests/tst670.stable.err
--- a/monetdb5/mal/Tests/tst670.stable.err
+++ b/monetdb5/mal/Tests/tst670.stable.err
@@ -10,6 +10,18 @@ stderr of test 'tst670` in directory 'mo
# 09:29:49 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25470" "--port=39422"
# 09:29:49 >
+MAPI = (monetdb) /var/tmp/mtest-8241/.s.monetdb.34087
+QUERY = function foo();
+ io.print("go");
+ end foo;
+ user.foo();
+ clients.quit();
+ function foo();
+ io.print("gone");
+ end foo;
+ mdb.List("user","foo");
+ user.foo();
+ERROR = !MALException:mal.interpreter:prematurely stopped client
# 09:29:49 >
# 09:29:49 > "Done."
diff --git a/monetdb5/mal/Tests/tst670.stable.out
b/monetdb5/mal/Tests/tst670.stable.out
--- a/monetdb5/mal/Tests/tst670.stable.out
+++ b/monetdb5/mal/Tests/tst670.stable.out
@@ -29,6 +29,7 @@ Ready.
# 09:29:49 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25470" "--port=39422"
# 09:29:49 >
+[ "gone" ]
# 23:53:05 >
# 23:53:05 > Done.
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1576,8 +1576,11 @@ copyfrom(mvc *sql, dlist *qname, dlist *
return NULL;
}
rel = rel_insert_table(sql, t, tname, rel);
- if (rel && locked)
+ if (rel && locked) {
rel->flag |= UPD_LOCKED;
+ if (rel->flag & UPD_COMP)
+ ((sql_rel *) rel->r)->flag |= UPD_LOCKED;
+ }
if (rel && !constraint)
rel->flag |= UPD_NO_CONSTRAINT;
return rel;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
