MonetDB: Jun2020 - merged

[Niels Nes]

Changeset: 4c556260b437 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c556260b437
Branch: Jun2020
Log Message:

merged


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
@@ -301,6 +301,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) {
@@ -311,6 +312,7 @@ SQLprepareClient(Client c, int login)
        }
 
 bailout:
+       MT_lock_set(&sql_contextLock);
        /*expect SQL text first */
        be->language = 'S';
        /* Set state, this indicates an initialized client scenario */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list