MonetDB: default - Merge with Jan2022 branch.

[Sjoerd Mullender]

Changeset: 131192c9890c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/131192c9890c
Modified Files:
        gdk/gdk.h
        gdk/gdk_aggr.c
        gdk/gdk_align.c
        gdk/gdk_bat.c
        gdk/gdk_batop.c
        gdk/gdk_bbp.c
        gdk/gdk_cand.c
        gdk/gdk_delta.c
        gdk/gdk_hash.c
        gdk/gdk_heap.c
        gdk/gdk_orderidx.c
        gdk/gdk_storage.c
        gdk/gdk_strimps.c
        gdk/gdk_tm.c
        gdk/gdk_unique.c
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_dataflow.c
        monetdb5/mal/mal_debugger.c
        monetdb5/modules/mal/tablet.c
        sql/backends/monet5/sql_statistics.c
        sql/server/CMakeLists.txt
        sql/storage/bat/bat_storage.c
Branch: default
Log Message:

Merge with Jan2022 branch.


diffs (40 lines):

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,6 @@ if(NOT HAVE_SYS_SOCKET_H)
     set(CMAKE_EXTRA_INCLUDE_FILES "winsock.h")
   endif()
 endif()
-set(CMAKE_REQUIRED_INCLUDES "/usr/include")
 
 monetdb_configure_sizes()
 
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -415,11 +415,12 @@ MCshutdowninprogress(void){
 void
 MCfreeClient(Client c)
 {
+       MT_lock_set(&mal_contextLock);
        if( c->mode == FREECLIENT) {
                assert(c->idx == -1);
+               MT_lock_unset(&mal_contextLock);
                return;
        }
-       MT_lock_set(&mal_contextLock);
        c->mode = FINISHCLIENT;
        MT_lock_unset(&mal_contextLock);
 
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -9,7 +9,7 @@
 BISON_TARGET(sqlparser
   sql_parser.y
   ${CMAKE_CURRENT_BINARY_DIR}/sql_parser.tab.c
-  COMPILE_FLAGS "-d -p sql"
+  COMPILE_FLAGS "-d -p sql -Wno-conflicts-sr -Wno-conflicts-rr"
   DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/sql_parser.tab.h)
 
 add_library(sqlserver STATIC)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org