MonetDB: default - Merge with octbugs branch.

[Sjoerd Mullender]

Changeset: 97e1cc7dd358 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97e1cc7dd358
Modified Files:
        monetdb5/modules/atoms/mtime.c
Branch: default
Log Message:

Merge with octbugs branch.


diffs (24 lines):

diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -394,9 +394,9 @@ date_diff_imp(const date d1, const date 
        return is_int_nil(diff) ? lng_nil : (lng) diff * (lng) (24*60*60*1000);
 }
 func2(MTIMEdate_diff, MTIMEdate_diff_bulk, "diff", date, date, lng, 
date_diff_imp, func2_noexcept, \
-         DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_INT, 
INIT_VAR, INIT_VAR, INIT_VAR, GET_NEXT_VAR, GET_NEXT_VAR, APPEND_VAR, 
FINISH_INT_SINGLE, CLEAR_NOTHING)
+         DEC_VAR, DEC_VAR, DEC_VAR_R, DEC_VAR, DEC_VAR, DEC_INT, INIT_VAR, 
INIT_VAR, INIT_VAR, GET_NEXT_VAR, GET_NEXT_VAR, APPEND_VAR, FINISH_INT_SINGLE, 
CLEAR_NOTHING)
 func2(MTIMEdaytime_diff_msec, MTIMEdaytime_diff_msec_bulk, "diff", daytime, 
daytime, lng, daytime_diff, func2_noexcept, \
-         DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_INT, 
INIT_VAR, INIT_VAR, INIT_VAR, GET_NEXT_VAR, GET_NEXT_VAR, APPEND_VAR, 
FINISH_INT_SINGLE, CLEAR_NOTHING)
+         DEC_VAR, DEC_VAR, DEC_VAR_R, DEC_VAR, DEC_VAR, DEC_INT, INIT_VAR, 
INIT_VAR, INIT_VAR, GET_NEXT_VAR, GET_NEXT_VAR, APPEND_VAR, FINISH_INT_SINGLE, 
CLEAR_NOTHING)
 
 static inline str
 date_sub_msec_interval(date *ret, date d, lng ms)
@@ -573,7 +573,7 @@ TSDIFF(timestamp t1, timestamp t2)
        return diff;
 }
 func2(MTIMEtimestamp_diff_msec, MTIMEtimestamp_diff_msec_bulk, "diff", 
timestamp, timestamp, lng, TSDIFF, func2_noexcept, \
-         DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_VAR_R, DEC_INT, 
INIT_VAR, INIT_VAR, INIT_VAR, GET_NEXT_VAR, GET_NEXT_VAR, APPEND_VAR, 
FINISH_INT_SINGLE, CLEAR_NOTHING)
+         DEC_VAR, DEC_VAR, DEC_VAR_R, DEC_VAR, DEC_VAR, DEC_INT, INIT_VAR, 
INIT_VAR, INIT_VAR, GET_NEXT_VAR, GET_NEXT_VAR, APPEND_VAR, FINISH_INT_SINGLE, 
CLEAR_NOTHING)
 
 static inline int
 timestamp_century(const timestamp t)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list