Changeset: 63b07fcde2be for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63b07fcde2be Modified Files: tools/merovingian/ChangeLog tools/merovingian/daemon/forkmserver.c Branch: default Log Message:
merovingian: forward property no longer exists for databases diffs (29 lines): diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog --- a/tools/merovingian/ChangeLog +++ b/tools/merovingian/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog +* Wed Feb 16 2011 Fabian Groffen <[email protected]> +- The forward property for databases has been removed. Instead, only + a global proxy or redirect mode can be set using monetdbd. + * Tue Feb 15 2011 Fabian Groffen <[email protected]> - monetdbd can no longer log error and normal messages to separate logfiles, logging to stdout and stderr is no longer possible either. 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 @@ -182,10 +182,7 @@ ckv = getDefaultProps(); readProps(ckv, (*stats)->path); - kv = findConfKey(ckv, "forward"); - if (kv->val == NULL) - kv = findConfKey(_mero_db_props, "forward"); - mydoproxy = strcmp(kv->val, "proxy") == 0; + mydoproxy = strcmp(getConfVal(_mero_props, "forward"), "proxy") == 0; kv = findConfKey(ckv, "nthreads"); if (kv->val == NULL) _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
