MonetDB: default - Merge with Apr2019 branch.

[Sjoerd Mullender]

Changeset: 2f4316aa0d8a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f4316aa0d8a
Modified Files:
        monetdb5/mal/mal_interpreter.c
Branch: default
Log Message:

Merge with Apr2019 branch.


diffs (12 lines):

diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -565,7 +565,7 @@ str runMALsequence(Client cntxt, MalBlkP
                        lng t = GDKusec();
                        if (cntxt->lastprint + qptimeout < t) {
                                fprintf(stderr, "#%s: query already running 
"LLFMT"s: %.200s\n",
-                                               cntxt->mythread->name, (t - 
cntxt->lastprint)/1000000,
+                                               cntxt->mythread->name, (lng) 
(time(0) - cntxt->lastcmd),
                                                cntxt->query);
                                cntxt->lastprint = t;
                        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list