Changeset: 9f678c705c09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f678c705c09
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
libversions
sql/ChangeLog-Archive
sql/ChangeLog.Jul2015
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (171 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -599,3 +599,6 @@ a1a48562a4651b1beb3168290777cbeb91f474d8
71a9c48c90348eab78069f2ecc616e3f73bbba95 Jul2015_root
77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_1
77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_release
+30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_3
+77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_release
+30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -995,6 +995,28 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Tue Aug 18 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.3-20150818
+- Rebuilt.
+- BZ#3361: constants as MAL function parameters prevent intermediate reuse
+- BZ#3440: Sequence type errors
+- BZ#3449: mserver crash on start - Freebsd 10 amd64
+- BZ#3496: autocompletion table names does not work correctly
+- BZ#3758: "COPY INTO ..." doesn't work, if executing from 2 processes
+ concurrently.
+- BZ#3763: JDBC PreparedStatement for a table with 14 Foreign Keys
+ crashing the Database
+- BZ#3783: Behavioural change in Jul2015 for 'timestamp minus timestamp'
+- BZ#3784: Assertion failed: (bn->batCapacity >= cnt), function
+ BAT_scanselect, file gdk_select.c, line 1008.
+- BZ#3785: sum(interval) causes overflow in conversion to bte
+- BZ#3786: ResultSet.close() never sends Xclose to free resources
+- BZ#3787: "b and g must be aligned" from complex group/union query
+- BZ#3791: HEAPextend: failed to extend to 2420077101056
+
+* Tue Aug 18 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.3-20150818
+- sql: Differences between time, timestamp, and date values now return properly
+ typed interval types (second or month intervals) instead of integers.
+
* Fri Aug 07 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807
- Rebuilt.
- BZ#3364: Cannot set role back to a user's default role
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+monetdb (11.21.3) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#3361: constants as MAL function parameters prevent intermediate reuse
+ * BZ#3440: Sequence type errors
+ * BZ#3449: mserver crash on start - Freebsd 10 amd64
+ * BZ#3496: autocompletion table names does not work correctly
+ * BZ#3758: "COPY INTO ..." doesn't work, if executing from 2 processes
+ concurrently.
+ * BZ#3763: JDBC PreparedStatement for a table with 14 Foreign Keys
+ crashing the Database
+ * BZ#3783: Behavioural change in Jul2015 for 'timestamp minus timestamp'
+ * BZ#3784: Assertion failed: (bn->batCapacity >= cnt), function
+ BAT_scanselect, file gdk_select.c, line 1008.
+ * BZ#3785: sum(interval) causes overflow in conversion to bte
+ * BZ#3786: ResultSet.close() never sends Xclose to free resources
+ * BZ#3787: "b and g must be aligned" from complex group/union query
+ * BZ#3791: HEAPextend: failed to extend to 2420077101056
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 18 Aug 2015 13:44:54 +0200
+
+monetdb (11.21.3) unstable; urgency=low
+
+ * sql: Differences between time, timestamp, and date values now return
properly
+ typed interval types (second or month intervals) instead of integers.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 18 Aug 2015 13:44:54 +0200
+
monetdb (11.21.1) unstable; urgency=low
* Rebuilt.
diff --git a/java/Makefile.ag b/java/Makefile.ag
--- a/java/Makefile.ag
+++ b/java/Makefile.ag
@@ -16,7 +16,7 @@ JAVA_HOME = @JAVA_HOME@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/monetdb/lib
- FILES = monetdb-mcl-1.12.jar monetdb-jdbc-2.16.jar jdbcclient.jar
+ FILES = monetdb-mcl-1.12.jar monetdb-jdbc-2.17.jar jdbcclient.jar
}
ant_distmerocontrol = {
diff --git a/java/build.properties b/java/build.properties
--- a/java/build.properties
+++ b/java/build.properties
@@ -19,7 +19,7 @@ MCL_MINOR=12
# major release number
JDBC_MAJOR=2
# minor release number
-JDBC_MINOR=16
+JDBC_MINOR=17
# an additional identifying string
JDBC_VER_SUFFIX=Liberica
# the default port to connect on, if no port given when using SQL
diff --git a/java/pom.xml b/java/pom.xml
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -15,7 +15,7 @@ Copyright 2008-2015 MonetDB B.V.
<modelVersion>4.0.0</modelVersion>
<groupId>monetdb</groupId>
<artifactId>monetdb-jdbc</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
<name>monetdb-jdbc</name>
<description>MonetDB JDBC driver</description>
<repositories>
diff --git a/java/release.txt b/java/release.txt
--- a/java/release.txt
+++ b/java/release.txt
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 2.16 (Liberica/MCL-1.12)
+MonetDB JDBC driver version 2.17 (Liberica/MCL-1.12)
Fabian Groffen <fab...@monetdb.org>
-Release date: 2015-08-07
+Release date: 2015-08-18
This JDBC driver is designed for use with MonetDB, a main-memory
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-GDK_VERSION=12:0:0
+GDK_VERSION=12:1:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=7:5:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=19:0:0
+MONETDB5_VERSION=19:1:0
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=7:0:0
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Aug 18 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.3-20150818
+- Differences between time, timestamp, and date values now return properly
+ typed interval types (second or month intervals) instead of integers.
+
* Tue Jul 28 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807
- Added support for 128-bit integers (called HUGEINT) on platforms that
support this.
diff --git a/sql/ChangeLog.Jul2015 b/sql/ChangeLog.Jul2015
--- a/sql/ChangeLog.Jul2015
+++ b/sql/ChangeLog.Jul2015
@@ -1,7 +1,3 @@
# 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.
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
