Changeset: e8bc7bf7571a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e8bc7bf7571a
Modified Files:
monetdb5/mal/mal_profiler.c
Branch: Oct2020
Log Message:
Fix merge.
diffs (12 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -536,7 +536,7 @@ profilerHeartbeatEvent(char *alter)
if (!logadd(&logbuf, "{")) // fill in later with the event counter
return;
- if (!GDKinmemory()) {
+ if (!GDKinmemory() && !GDKembedded()) {
char *uuid = NULL, *err;
if ((err = msab_getUUID(&uuid)) == NULL) {
bool ok = logadd(&logbuf, "\"session\":\"%s\",", uuid);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
