Changeset: 4450ff9fa3f2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4450ff9fa3f2 Modified Files: tools/merovingian/ChangeLog.Oct2012 tools/merovingian/daemon/merovingian.c Branch: Oct2012 Log Message:
merovingian: fix logic error for discovery We shouldn't treat discovery being disabled as failure, but just optionally skip setting up the UDP channel. Fixes bug #3155. diffs (23 lines): diff --git a/tools/merovingian/ChangeLog.Oct2012 b/tools/merovingian/ChangeLog.Oct2012 --- a/tools/merovingian/ChangeLog.Oct2012 +++ b/tools/merovingian/ChangeLog.Oct2012 @@ -1,3 +1,7 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog +* Tue Oct 9 2012 Fabian Groffen <[email protected]> +- Fixed problem where monetdbd would refuse to startup when discovery + was set to false, bug #3155 + 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 @@ -1069,7 +1069,7 @@ main(int argc, char *argv[]) (e = openConnectionTCP(&sock, port, stdout)) == NO_ERR && (unlink(control_usock) | unlink(mapi_usock) | 1) && (e = openConnectionUNIX(&socku, mapi_usock, 0, stdout)) == NO_ERR && - (discovery == 1 && (e = openConnectionUDP(&usock, port)) == NO_ERR) && + (discovery == 0 || (e = openConnectionUDP(&usock, port)) == NO_ERR) && (e = openConnectionUNIX(&unsock, control_usock, S_IRWXO, _mero_ctlout)) == NO_ERR ) { _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
