MonetDB: Aug2024 - Merge with Dec2023 branch.

[Sjoerd Mullender via checkin-list]

Changeset: 147c15a43220 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/147c15a43220
Branch: Aug2024
Log Message:

Merge with Dec2023 branch.


diffs (22 lines):

diff --git a/tools/merovingian/daemon/forkmserver.c 
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <string.h> /* char ** */
 #include <time.h> /* localtime */
+#include <fcntl.h>
 
 #include "msabaoth.h"
 #include "utils/utils.h"
@@ -718,6 +719,10 @@ forkMserver(const char *database, sabdb*
                dp->type = MERODB;
                dp->pid = pid;
                dp->flag = 0;
+#if defined(FD_CLOEXEC) && defined(HAVE_FCNTL)
+               (void) fcntl(pfdo[0], F_SETFD, FD_CLOEXEC);
+               (void) fcntl(pfde[0], F_SETFD, FD_CLOEXEC);
+#endif
                pthread_mutex_unlock(&_mero_topdp_lock);
 
                while (argv[freec] != NULL) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org