Changeset: fe17475f2e57 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe17475f2e57
Modified Files:
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
merovingian: fix up gdk_dbfarm workarounds
- don't try to use strings from the stack where malloced strings are
expected
- use confkeyval structure as intended, just filling in default for
gdk_dbfarm
- also make monetdb find dbfarm correctly
diffs (33 lines):
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -1360,7 +1360,7 @@
int fd;
confkeyval ckv[] = {
{"prefix", strdup(PREFIX), STR},
- {"gdk_dbfarm", NULL, STR},
+ {"gdk_dbfarm", strdup(LOCALSTATEDIR
"/monetdb5/dbfarm"), STR},
{"gdk_nr_threads", NULL, INT},
{"mero_doproxy", strdup("yes"), BOOL},
{"mero_discoveryport", NULL, INT},
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
@@ -407,7 +407,7 @@
int thret;
confkeyval ckv[] = {
{"prefix", strdup(PREFIX), STR},
- {"gdk_dbfarm", NULL, STR},
+ {"gdk_dbfarm", strdup(LOCALSTATEDIR
"/monetdb5/dbfarm"), STR},
{"gdk_nr_threads", NULL, INT},
{"sql_optimizer", NULL, STR},
{"mero_msglog", strdup(MERO_LOG), STR},
@@ -493,7 +493,7 @@
kv = findConfKey(ckv, "prefix");
prefix = kv->val; /* has default, must be set */
kv = findConfKey(ckv, "gdk_dbfarm");
- dbfarm = replacePrefix(kv->val ? kv->val : LOCALSTATEDIR
"/monetdb5/dbfarm" , prefix);
+ dbfarm = replacePrefix(kv->val, prefix); /* has default, must be set */
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
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
