MonetDB: default - merging with default

[Martin Kersten]

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

merging with default


diffs (31 lines):

diff --git a/tools/merovingian/daemon/discoveryrunner.c 
b/tools/merovingian/daemon/discoveryrunner.c
--- a/tools/merovingian/daemon/discoveryrunner.c
+++ b/tools/merovingian/daemon/discoveryrunner.c
@@ -205,6 +205,7 @@ getRemoteDB(char *database)
                        walk->conns = malloc(sizeof(sablist));
                        walk->conns->val = strdup(rdb->conn);
                        walk->conns->next = NULL;
+                       walk->uri = NULL;
                        walk->next = NULL;
                        walk->uplog = NULL;
 
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -228,7 +228,15 @@ secondsToString(char *buf, time_t t, int
        time_t p;
        size_t i = 0;
 
-       p = 1 * 60 * 60 * 24 * 7;
+       p = 1 * 60 * 60 * 24 * 7 * 52;
+       if (t > p) {
+               i += sprintf(buf + i, "%dy", (int)(t / p));
+               t -= (t / p) * p;
+               if (--longness == 0)
+                       return;
+               buf[i++] = ' ';
+       }
+       p /= 52;
        if (t > p) {
                i += sprintf(buf + i, "%dw", (int)(t / p));
                t -= (t / p) * p;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list