Changeset: 2c4bc494a6c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c4bc494a6c3
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
monetdb5/modules/atoms/mtime.h
Branch: default
Log Message:
Merge with default
diffs (102 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1129,6 +1129,7 @@ str CLTsetHistory(Client cntxt, MalBlkPt
str CLTsetListing(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTsetPassword(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTsetScenario(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CLTsetSessionTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CLTsetTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTsha1sum(str *ret, str *pw);
str CLTsha2sum(str *ret, str *pw, int *bits);
@@ -1639,10 +1640,7 @@ void MSscheduleClient(str command, str c
void MSserveClient(void *dummy);
str MTIMEcompute_rule_foryear(date *ret, const rule *val, const int *year);
str MTIMEcurrent_date(date *d);
-str MTIMEcurrent_date(date *d);
str MTIMEcurrent_time(daytime *t);
-str MTIMEcurrent_time(daytime *t);
-str MTIMEcurrent_timestamp(timestamp *t);
str MTIMEcurrent_timestamp(timestamp *t);
str MTIMEdate2date(date *ret, const date *src);
str MTIMEdate_add_msec_interval_lng_wrap(date *ret, const date *t, const lng
*msec);
@@ -1706,7 +1704,6 @@ str MTIMErule_extract_minutes(int *ret,
str MTIMErule_extract_month(int *ret, const rule *r);
str MTIMErule_extract_weekday(int *ret, const rule *r);
str MTIMErule_fromstr(rule *ret, const char **s);
-str MTIMErule_fromstr(rule *ret, const char **s);
str MTIMErule_tostr(str *s, const rule *r);
str MTIMEsecs2daytime(daytime *ret, const lng *src);
str MTIMEsql_day(lng *ret, const lng *t);
@@ -3118,7 +3115,6 @@ str timestampRef;
int timestamp_fromstr(const char *buf, int *len, timestamp **ret);
timestamp *timestamp_nil;
int timestamp_tostr(str *buf, int *len, const timestamp *val);
-int timestamp_tostr(str *buf, int *len, const timestamp *val);
int timestamp_tz_tostr(str *buf, int *len, const timestamp *val, const tzone
*timezone);
str tinterRef;
str tintersectRef;
@@ -3134,7 +3130,6 @@ int tubProp;
str tuniqueRef;
void typeChecker(stream *out, Module scope, MalBlkPtr mb, InstrPtr p, int
silent);
int tzone_fromstr(const char *buf, int *len, tzone **d);
-int tzone_fromstr(const char *buf, int *len, tzone **d);
tzone tzone_local;
int tzone_tostr(str *buf, int *len, const tzone *z);
str unescape_str(str *retval, str s);
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1426,7 +1426,7 @@ static void gnuplotheader(char *filename
static void createTomogram(void)
{
char buf[BUFSIZ];
- int rows[MAXTHREADS];
+ int rows[MAXTHREADS] = {0};
int top = 0;
int i, j;
int h, prevobject = 1;
@@ -1458,8 +1458,6 @@ static void createTomogram(void)
fprintf(gnudata, "set xrange ["LLFMT".0:"LLFMT".0]\n", startrange,
lastclktick - starttime);
/* detect all different threads and assign them a row */
- for (j = 0; j < MAXTHREADS; j++)
- rows[j]=0; // needed to silense compiler
for (i = 0; i < topbox; i++)
if (box[i].clkend && box[i].state != PING) {
for (j = 0; j < top; j++)
diff --git a/monetdb5/modules/atoms/mtime.h b/monetdb5/modules/atoms/mtime.h
--- a/monetdb5/modules/atoms/mtime.h
+++ b/monetdb5/modules/atoms/mtime.h
@@ -123,14 +123,12 @@ mtime_export int daytime_tz_fromstr(cons
mtime_export str MTIMEcurrent_timestamp(timestamp *t);
mtime_export str MTIMEcurrent_date(date *d);
mtime_export str MTIMEcurrent_time(daytime *t);
-mtime_export int timestamp_tostr(str *buf, int *len, const timestamp *val);
mtime_export int timestamp_tz_tostr(str *buf, int *len, const timestamp *val,
const tzone *timezone);
mtime_export str MTIMEnil2date(date *ret, const int *src);
mtime_export str MTIMEdate2date(date *ret, const date *src);
mtime_export str MTIMEdaytime2daytime(daytime *ret, const daytime *src);
mtime_export str MTIMEsecs2daytime(daytime *ret, const lng *src);
mtime_export str MTIMEtimestamp2timestamp(timestamp *ret, const timestamp
*src);
-mtime_export str MTIMErule_fromstr(rule *ret, const char **s);
mtime_export str MTIMEprelude(void);
mtime_export str MTIMEepilogue(void);
mtime_export str MTIMEsynonyms(const bit *allow);
@@ -237,16 +235,12 @@ mtime_export str MTIMEtimestamp_lng(time
mtime_export str MTIMEruleDef0(rule *ret, const int *m, const int *d, const
int *w, const int *h, const int *mint);
mtime_export str MTIMEruleDef1(rule *ret, const int *m, const char **dnme,
const int *w, const int *h, const int *mint);
mtime_export str MTIMEruleDef2(rule *ret, const int *m, const char **dnme,
const int *w, const int *mint);
-mtime_export str MTIMEcurrent_timestamp(timestamp *t);
-mtime_export str MTIMEcurrent_date(date *d);
-mtime_export str MTIMEcurrent_time(daytime *t);
mtime_export int date_fromstr(const char *buf, int *len, date **d);
mtime_export int date_tostr(str *buf, int *len, const date *val);
mtime_export int daytime_fromstr(const char *buf, int *len, daytime **ret);
mtime_export int daytime_tostr(str *buf, int *len, const daytime *val);
mtime_export int timestamp_fromstr(const char *buf, int *len, timestamp **ret);
mtime_export int timestamp_tostr(str *buf, int *len, const timestamp *val);
-mtime_export int tzone_fromstr(const char *buf, int *len, tzone **d);
mtime_export int tzone_tostr(str *buf, int *len, const tzone *z);
mtime_export int rule_fromstr(const char *buf, int *len, rule **d);
mtime_export int rule_tostr(str *buf, int *len, const rule *r);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
