MonetDB: default - Merge with hammertime.

[Aris Koning]

Changeset: 7dbcdf94fe28 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dbcdf94fe28
Branch: default
Log Message:

Merge with hammertime.


diffs (12 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1058,7 +1058,7 @@ GDKreset(int status)
                for (Thread t = GDKthreads; t < GDKthreads + THREADS; t++) {
                        MT_Id victim;
                        if ((victim = (MT_Id) ATOMIC_GET(&t->pid)) != 0) {
-                               if (victim != pid) {
+                               if (pid && victim != pid) {
                                        int e;
 
                                        killed = true;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list