Changeset: 4655a387f284 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4655a387f284
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/Tests/tachograph--help.stable.err
monetdb5/mal/mal_profiler.c
Branch: profiler
Log Message:
Fix compilation and test output
diffs (41 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2287,6 +2287,7 @@ int malBootstrap(void);
str malCommandCall(MalStkPtr stk, InstrPtr pci);
int malProfileMode;
str malRef;
+MT_Lock mal_beatLock;
ClientRec *mal_clients;
MT_Lock mal_contextLock;
MT_Lock mal_copyLock;
diff --git a/clients/mapiclient/Tests/tachograph--help.stable.err
b/clients/mapiclient/Tests/tachograph--help.stable.err
--- a/clients/mapiclient/Tests/tachograph--help.stable.err
+++ b/clients/mapiclient/Tests/tachograph--help.stable.err
@@ -15,7 +15,6 @@ tachograph [options]
-u | --user=<user>
-p | --port=<portnr>
-h | --host=<hostname>
- -w | --wait=<delay time> in milliseconds
-? | --help
# 23:54:13 >
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
@@ -25,7 +25,6 @@ static void cachedProfilerEvent(MalBlkPt
stream *eventstream = 0;
-static int offlineProfiling = FALSE;
static int sqlProfiling = FALSE;
static str myname = 0; // avoid tracing the profiler module
static int eventcounter = 0;
@@ -607,7 +606,6 @@ startProfiler(void)
eventcounter = 0;
}
malProfileMode = 1;
- offlineProfiling = TRUE;
sqlProfiling = TRUE;
MT_lock_unset(&mal_profileLock, "startProfiler");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
