Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27059
Modified Files:
Tag: Nov2009
ChangeLog.Nov2009 utils.c
Log Message:
Make sure we don't overwrite our weeks if we had them
Index: utils.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/utils.c,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -d -r1.13.2.2 -r1.13.2.3
--- utils.c 9 Oct 2009 13:24:14 -0000 1.13.2.2
+++ utils.c 26 Oct 2009 10:17:47 -0000 1.13.2.3
@@ -210,7 +210,7 @@
p = 1 * 60 * 60 * 24 * 7;
if (t > p) {
- i += sprintf(buf, "%dw", (int)(t / p));
+ i += sprintf(buf + i, "%dw", (int)(t / p));
t -= (t / p) * p;
if (--longness == 0)
return;
@@ -218,7 +218,7 @@
}
p /= 7;
if (t > p) {
- i += sprintf(buf, "%dd", (int)(t / p));
+ i += sprintf(buf + i, "%dd", (int)(t / p));
t -= (t / p) * p;
if (--longness == 0)
return;
Index: ChangeLog.Nov2009
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/ChangeLog.Nov2009,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- ChangeLog.Nov2009 8 Oct 2009 12:51:42 -0000 1.1.2.3
+++ ChangeLog.Nov2009 26 Oct 2009 10:17:47 -0000 1.1.2.4
@@ -3,6 +3,10 @@
*Nov2009
+ 26 Oct 2009; Fabian Groffen <[email protected]> utils.c
+ Fix bug that caused monetdb status to list an incorrect uptime in
+ cases where the uptime was longer than 7 days.
+
08 Oct 2009; Fabian Groffen <[email protected]> merovingian.c,
merovingian_forkmserver.c, monetdb.c, properties.c:
Add optpipe setting to control the SQL optimiser pipeline, useful for
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
