MonetDB: Jul2021 - add missing lock for log_constant

[Niels Nes]

Changeset: 408555702318 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/408555702318
Modified Files:
        gdk/gdk_logger.c
        sql/backends/monet5/sql_user.c
Branch: Jul2021
Log Message:

add missing lock for log_constant


diffs (39 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2329,9 +2329,12 @@ log_constant(logger *lg, int type, ptr v
 
        if (LOG_DISABLED(lg) || !nr) {
                /* logging is switched off */
-               if (nr)
-                       return la_bat_update_count(lg, id, offset+cnt);
-               return GDK_SUCCEED;
+               if (nr) {
+                       logger_lock(lg);
+                       ok = la_bat_update_count(lg, id, offset+cnt);
+                       logger_unlock(lg);
+               }
+               return ok;
        }
 
        gdk_return (*wt) (const void *, stream *, size_t) = 
BATatoms[type].atomWrite;
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -19,7 +19,6 @@
 #include "sql_user.h"
 #include "sql_mvc.h"
 #include "sql_privileges.h"
-#include "bat5.h"
 #include "mal_interpreter.h"
 #include "mal_authorize.h"
 #include "mcrypt.h"
@@ -683,7 +682,7 @@ monet5_user_set_def_schema(mvc *m, oid u
                freeException(path_err);
                return ok == 0 ? -3 : -1;
        }
-       
+
        /* reset the user and schema names */
        if (!sqlvar_set_string(find_global_var(m, sys, "current_schema"), 
schema) ||
                !sqlvar_set_string(find_global_var(m, sys, "current_user"), 
username) ||
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list