MonetDB: default - merovingian: gdk_dbfarm key is always found, ...

[Fabian Groffen]

Changeset: 901c889ab9b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=901c889ab9b6
Modified Files:
        tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:

merovingian: gdk_dbfarm key is always found, check val instead


diffs (12 lines):

diff --git a/tools/merovingian/daemon/merovingian.c 
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -493,7 +493,7 @@
        kv = findConfKey(ckv, "prefix");
        prefix = kv->val; /* has default, must be set */
        kv = findConfKey(ckv, "gdk_dbfarm");
-       dbfarm = replacePrefix(kv ? kv->val : LOCALSTATEDIR "/monetdb5/dbfarm" 
, prefix);
+       dbfarm = replacePrefix(kv->val ? kv->val : LOCALSTATEDIR 
"/monetdb5/dbfarm" , prefix);
        kv = findConfKey(ckv, "mero_msglog");
        _mero_msglogfile = replacePrefix(kv->val, prefix);
        if (strcmp(kv->val, "") == 0) { /* has default, must be set */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list