MonetDB: pyapi - Fix for enabling embedded python in monetdbd.

[Mark Raasveldt]

Changeset: ef2a67093c24 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef2a67093c24
Modified Files:
        tools/merovingian/daemon/forkmserver.c
        tools/merovingian/utils/utils.c
Branch: pyapi
Log Message:

Fix for enabling embedded python in monetdbd.


diffs (24 lines):

diff --git a/tools/merovingian/daemon/forkmserver.c 
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -321,7 +321,7 @@ forkMserver(char *database, sabdb** stat
 
                kv = findConfKey(ckv, "embedpy");
                if (kv->val != NULL && strcmp(kv->val, "no") != 0)
-                       embeddedr = "embedded_py=true";
+                       embeddedpy = "embedded_py=true";
 
                /* redirect stdout and stderr to a new pair of fds for
                 * logging help */
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -133,6 +133,8 @@ defaultProperty(char *property) {
                return 1;
        } else if (property != NULL && strcmp(property, "embedr") == 0) {
                return 1;
+       } else if (property != NULL && strcmp(property, "embedpy") == 0) {
+               return 1;
        }
        return 0;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list