MonetDB: default - Merge with Aug2011 branch.

[Sjoerd Mullender]

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

Merge with Aug2011 branch.


diffs (12 lines):

diff --git a/tools/merovingian/daemon/argvcmds.c 
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -270,7 +270,7 @@ command_get(confkeyval *ckv, int argc, c
 
                                /* re-read, this time with empty defaults, so 
we can see
                                 * what's available (backwards compatability) */
-                               if (readProps(cport, dbfarm) != 0) {
+                               if (readProps(cport, ".") != 0) {
                                        fprintf(stderr, "unable to read 
properties from %s: %s\n",
                                                        dbfarm, 
strerror(errno));
                                        return(1);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list