MonetDB: default - Merge with default

[Martin Kersten]

Changeset: df8086909601 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df8086909601
Modified Files:
        monetdb5/mal/mal_profiler.c
        sql/backends/monet5/sql_execute.c
Branch: default
Log Message:

Merge with default


diffs (23 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
@@ -775,6 +775,7 @@ clearTrace(void)
        MT_lock_set(&mal_contextLock);
        if (TRACE_init == 0) {
                MT_lock_unset(&mal_contextLock);
+               initTrace();
                return;     /* not initialized */
        }
        /* drop all trace tables */
diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -76,7 +76,7 @@ SQLsetTrace(Client cntxt)
        int k;
 
        startTrace("sql_traces");
-       initTrace();
+       clearTrace();
 
        for(k= mb->stop-1; k>0; k--)
                if( getInstrPtr(mb,k)->token ==ENDsymbol)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list