MonetDB: nostmt - merged with default

[Niels Nes]

Changeset: 4b43fd120092 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b43fd120092
Modified Files:
        sql/backends/monet5/UDF/pyapi/pyapi.c
Branch: nostmt
Log Message:

merged with default


diffs (12 lines):

diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.c 
b/sql/backends/monet5/UDF/pyapi/pyapi.c
--- a/sql/backends/monet5/UDF/pyapi/pyapi.c
+++ b/sql/backends/monet5/UDF/pyapi/pyapi.c
@@ -336,7 +336,7 @@ str PyAPIeval(Client cntxt, MalBlkPtr mb
     }
 
 #ifdef HAVE_FORK
-    if (!mapped) {
+    if (!mapped && !parallel_aggregation) {
         MT_lock_set(&pyapiLock);
         if (python_call_active) {
             mapped = true;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list