Changeset: f7b77db34236 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7b77db34236 Modified Files: .hgtags MonetDB.spec debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Jul2015 libversions Branch: Jun2016 Log Message:
Merge with Jul2015 branch. diffs (117 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -620,3 +620,5 @@ feec2e4020548d3137a0e946b7a4e29db5b9e14a ee2d8c8d65c35ed022ca0785f30fcf4b051a542e Jun2016_root ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_17 ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_SP3_release +51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_19 +51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_SP4_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -104,7 +104,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP4/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist BuildRequires: systemd @@ -986,6 +986,20 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Tue Apr 05 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405 +- Rebuilt. +- BZ#3905: MonetDB doesn't handle ANY/SOME/ALL operator correctly +- BZ#3929: R aggregate not recognized when using 3 or more parameters +- BZ#3965: Not possible to quote/escape single quote character in the + name of the file to load. +- BZ#3968: Missing double use of column names + +* Mon Apr 4 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405 +- gdk: Fixed a bug that caused various instances where old data returned or + where crashes occurred. The problem was that internally data wasn't + always marked dirty when it was being changed, causiing later processing + to not deal with the changed data correctly. + * Thu Mar 24 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.17-20160324 - Rebuilt. - BZ#2972: SQL URL functionality contains errors diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +monetdb (11.21.19) unstable; urgency=low + + * Rebuilt. + * BZ#3905: MonetDB doesn't handle ANY/SOME/ALL operator correctly + * BZ#3929: R aggregate not recognized when using 3 or more parameters + * BZ#3965: Not possible to quote/escape single quote character in the + name of the file to load. + * BZ#3968: Missing double use of column names + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 05 Apr 2016 11:29:47 +0200 + +monetdb (11.21.19) unstable; urgency=low + + * gdk: Fixed a bug that caused various instances where old data returned or + where crashes occurred. The problem was that internally data wasn't + always marked dirty when it was being changed, causiing later processing + to not deal with the changed data correctly. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 4 Apr 2016 11:29:47 +0200 + monetdb (11.21.17) 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,12 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Apr 4 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405 +- Fixed a bug that caused various instances where old data returned or + where crashes occurred. The problem was that internally data wasn't + always marked dirty when it was being changed, causiing later processing + to not deal with the changed data correctly. + * Wed Feb 4 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807 - BUNtvar and BUNhvar macros no longer work for TYPE_void columns. diff --git a/gdk/ChangeLog.Jul2015 b/gdk/ChangeLog.Jul2015 --- a/gdk/ChangeLog.Jul2015 +++ b/gdk/ChangeLog.Jul2015 @@ -1,9 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Mon Apr 4 2016 Sjoerd Mullender <sjo...@acm.org> -- Fixed a bug that caused various instances where old data returned or - where crashes occurred. The problem was that internally data wasn't - always marked dirty when it was being changed, causiing later processing - to not deal with the changed data correctly. - 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:8:0 +GDK_VERSION=12:9:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=7:6:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=20:3:1 +MONETDB5_VERSION=20:4:1 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=7:0:0 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list