MonetDB: default - Merge with Jun2016 branch.

[Sjoerd Mullender]

Changeset: 04a33eb12363 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04a33eb12363
Modified Files:
        clients/mapiclient/tomograph.c
        monetdb5/mal/mal_runtime.c
Branch: default
Log Message:

Merge with Jun2016 branch.


diffs (23 lines):

diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1877,6 +1877,8 @@ main(int argc, char **argv)
                resetTomograph();
                conn = mapi_get_from(dbh);
                while ((m = mnstr_read(conn, buffer + len, 1, buflen - len-1)) 
>= 0) {
+                       if (m == 0 && (m = mnstr_read(conn, buffer + len, 1, 
buflen - len-1)) <= 0)
+                               break;
                        buffer[len + m] = 0;
                        response = buffer;
                        while ((e = strchr(response, '\n')) != NULL) {
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -120,6 +120,7 @@ runtimeProfileFinish(Client cntxt, MalBl
        }
 
        qtop = j;
+       QRYqueue[qtop].query = NULL; /* sentinel for SYSMONqueue() */
        MT_lock_unset(&mal_delayLock);
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list