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/ma
Changeset: feed63df7713 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/feed63df7713
Modified Files:
clients/mapilib/mapi.c
Branch: Oct2020
Log Message:
Fix merge.
diffs (11 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/c
