MonetDB: default - Merge with Jul2015 branch.

[Sjoerd Mullender]

Changeset: 160c3e961d57 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=160c3e961d57
Modified Files:
        sql/ChangeLog.Jul2015
        sql/backends/monet5/sql_result.c
Branch: default
Log Message:

Merge with Jul2015 branch.


diffs (23 lines):

diff --git a/sql/ChangeLog.Jul2015 b/sql/ChangeLog.Jul2015
--- a/sql/ChangeLog.Jul2015
+++ b/sql/ChangeLog.Jul2015
@@ -1,3 +1,7 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Tue Aug 18 2015 Sjoerd Mullender <sjo...@acm.org>
+- Differences between time, timestamp, and date values now return properly
+  typed interval types (second or month intervals) instead of integers.
+
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1476,7 +1476,7 @@ export_length(stream *s, int mtype, int 
                } else {        /* TYPE_dbl */
                        ok = mvc_send_int(s, 24);
                }
-       } else if (eclass == EC_DEC) {
+       } else if (eclass == EC_DEC || eclass == EC_SEC) {
                count = 1 + digits;
                if (scale > 0)
                        count += 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list