Changeset: e50689dcfd87 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e50689dcfd87 Modified Files: .hgtags MonetDB.spec buildtools/ChangeLog-Archive buildtools/ChangeLog.Oct2014 debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Oct2014 java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Oct2014 sql/ChangeLog-Archive sql/ChangeLog.Oct2014 Branch: default Log Message:
Merge with Oct2014 branch. diffs (truncated from 329 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -581,3 +581,5 @@ 4f894ebf1a93ae895ec23d54ce2112bf21a6427e e92e434d19b7308c2952d50978c2cfd78e1bdb80 Oct2014_3 4f894ebf1a93ae895ec23d54ce2112bf21a6427e Oct2014_release 88a29a5a2bef5c6cef6b3bfa5ab7c4d3b855a2c8 Oct2014_release +eb2967c408350131b63f5393704fd697c701fc49 Oct2014_5 +2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Oct2014/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -960,6 +960,45 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- Rebuilt. +- BZ#3580: cosmetic change (append newline) +- BZ#3609: Incorrect use of generate_series +- BZ#3611: quantile() and median() commands crash when used 2x on the + same variable on a null table +- BZ#3612: assertion failure when deleting rows from table to which a + FK constraint is defined +- BZ#3620: ORDER BY broken when using UNION ALL +- BZ#3621: Hexadecimal literal vs decimal literal + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- gdk: Implemented a change to the way in which string bats are appended. + We now try harder to limit the growth of the string heap. + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- monetdb5: Fixed adding of 0 intervals to dates. + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- sql: Fixed sys.queue() implementation to report on other queries being + executed. + +* Fri Nov 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- sql: A number of bugs were fixed in the code to upgrade a database from + previous releases. This version should fix the upgrade of a database + that had been upgraded to the Oct2014 release, but also properly + upgrade directly from Jan2014 and Feb2013 releases. + +* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- buildtools: The libraries included in the Windows installers have been upgraded. + We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. + +* Wed Nov 5 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- gdk: Fixed some problems with BATsample. It was possible for BATsample to + return a value that was just beyond the end of the sampled BAT. Also, + on some systems the range of the rand() function is rather limited + (0..32767) and trying to get a sample larger than this range would + result in an infinite loop. + * Tue Oct 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.3-20141028 - Rebuilt. diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- The libraries included in the Windows installers have been upgraded. + We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. + * Thu Apr 10 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.1-20141024 - Jacqueline, the MonetDB/JAQL frontend, has been removed. The frontend never grew beyond being experimental, and there is no interest anymore diff --git a/buildtools/ChangeLog.Oct2014 b/buildtools/ChangeLog.Oct2014 --- a/buildtools/ChangeLog.Oct2014 +++ b/buildtools/ChangeLog.Oct2014 @@ -1,7 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> -- The libraries included in the Windows installers have been upgraded. - We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,63 @@ +monetdb (11.19.5-20141120) unstable; urgency=low + + * Rebuilt. + * BZ#3580: cosmetic change (append newline) + * BZ#3609: Incorrect use of generate_series + * BZ#3611: quantile() and median() commands crash when used 2x on the + same variable on a null table + * BZ#3612: assertion failure when deleting rows from table to which a + FK constraint is defined + * BZ#3620: ORDER BY broken when using UNION ALL + * BZ#3621: Hexadecimal literal vs decimal literal + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * gdk: Implemented a change to the way in which string bats are appended. + We now try harder to limit the growth of the string heap. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * monetdb5: Fixed adding of 0 intervals to dates. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * sql: Fixed sys.queue() implementation to report on other queries being + executed. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * sql: A number of bugs were fixed in the code to upgrade a database from + previous releases. This version should fix the upgrade of a database + that had been upgraded to the Oct2014 release, but also properly + upgrade directly from Jan2014 and Feb2013 releases. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 14 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * buildtools: The libraries included in the Windows installers have been upgraded. + We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 7 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * gdk: Fixed some problems with BATsample. It was possible for BATsample to + return a value that was just beyond the end of the sampled BAT. Also, + on some systems the range of the rand() function is rather limited + (0..32767) and trying to get a sample larger than this range would + result in an infinite loop. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 5 Nov 2014 10:37:22 +0100 + monetdb (11.19.3-20141028) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,17 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- Implemented a change to the way in which string bats are appended. + We now try harder to limit the growth of the string heap. + +* Wed Nov 5 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- Fixed some problems with BATsample. It was possible for BATsample to + return a value that was just beyond the end of the sampled BAT. Also, + on some systems the range of the rand() function is rather limited + (0..32767) and trying to get a sample larger than this range would + result in an infinite loop. + * Mon Jul 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.1-20141024 - Added "multifarm" capability. It is now possible to separate persistent and transient BATs into different directories (presumably on different diff --git a/gdk/ChangeLog.Oct2014 b/gdk/ChangeLog.Oct2014 --- a/gdk/ChangeLog.Oct2014 +++ b/gdk/ChangeLog.Oct2014 @@ -1,14 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> -- Implemented a change to the way in which string bats are appended. - We now try harder to limit the growth of the string heap. - -* Wed Nov 5 2014 Sjoerd Mullender <sjo...@acm.org> -- Fixed some problems with BATsample. It was possible for BATsample to - return a value that was just beyond the end of the sampled BAT. Also, - on some systems the range of the rand() function is rather limited - (0..32767) and trying to get a sample larger than this range would - result in an infinite loop. - diff --git a/java/Makefile.ag b/java/Makefile.ag --- a/java/Makefile.ag +++ b/java/Makefile.ag @@ -27,7 +27,7 @@ JAVA_HOME = @JAVA_HOME@ ant_distjdbc = { COND = HAVE_JAVAJDBC DIR = datadir/monetdb/lib - FILES = monetdb-mcl-1.10.jar monetdb-jdbc-2.12.jar jdbcclient.jar + FILES = monetdb-mcl-1.10.jar monetdb-jdbc-2.13.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=10 # major release number JDBC_MAJOR=2 # minor release number -JDBC_MINOR=12 +JDBC_MINOR=13 # 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 @@ -26,7 +26,7 @@ All Rights Reserved. <modelVersion>4.0.0</modelVersion> <groupId>monetdb</groupId> <artifactId>monetdb-jdbc</artifactId> - <version>2.12</version> + <version>2.13</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.12 (Liberica/MCL-1.10) +MonetDB JDBC driver version 2.13 (Liberica/MCL-1.10) Fabian Groffen <fab...@monetdb.org> -Release date: 2014-10-24 +Release date: 2014-11-20 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=11:1:0 +GDK_VERSION=11:2:0 # version of the MAPI library (subdirectory clients/mapilib) -MAPI_VERSION=7:0:0 +MAPI_VERSION=7:1:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=17:1:0 +MONETDB5_VERSION=17:2:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=6:0:0 +STREAM_VERSION=6:1:0 diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive --- a/monetdb5/ChangeLog-Archive +++ b/monetdb5/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- Fixed adding of 0 intervals to dates. + * Mon Sep 15 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.1-20141024 - Removed algebra.materialize. diff --git a/monetdb5/ChangeLog.Oct2014 b/monetdb5/ChangeLog.Oct2014 --- a/monetdb5/ChangeLog.Oct2014 +++ b/monetdb5/ChangeLog.Oct2014 @@ -1,6 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> -- Fixed adding of 0 intervals to dates. - diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive --- a/sql/ChangeLog-Archive +++ b/sql/ChangeLog-Archive @@ -1,6 +1,16 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
