MonetDB: Oct2020 - Merge with Jun2020 branch.

[Sjoerd Mullender]

Changeset: 62cca5b7349e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62cca5b7349e
Modified Files:
        sql/backends/monet5/sql_scenario.c
Branch: Oct2020
Log Message:

Merge with Jun2020 branch.


diffs (19 lines):

diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -260,6 +260,7 @@ SQLprepareClient(Client c, int login)
        }
        if (m->session->tr)
                reset_functions(m->session->tr);
+       MT_lock_unset(&sql_contextLock);
        if (login) {
                str schema = monet5_user_set_def_schema(m, c->user);
                if (!schema) {
@@ -270,6 +271,7 @@ SQLprepareClient(Client c, int login)
        }
 
 bailout:
+       MT_lock_set(&sql_contextLock);
        /* expect SQL text first */
        if (be)
                be->language = 'S';
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list