Changeset: 41ceeb10e6a9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41ceeb10e6a9 Modified Files: .hgtags MonetDB.spec buildtools/ChangeLog-Archive buildtools/ChangeLog.Jan2014 debian/changelog libversions tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Jan2014 Branch: default Log Message:
Merge with Jan2014 branch. diffs (143 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -557,3 +557,5 @@ fb702cba0210295b29825b095ed87d92b6645434 ce19933aa1cf72076fd33ddd485ea0303f87753f Jan2014_9 fb702cba0210295b29825b095ed87d92b6645434 Jan2014_release 14baa1e3a827c26932ec5d853feca28eacd70009 Jan2014_release +28bad4f9c07415a7f784ac6af2494b0333c866a6 Jan2014_11 +fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jan2014/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -798,6 +798,20 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Mon Mar 03 2014 Sjoerd Mullender <[email protected]> - 11.17.11-20140303 +- Rebuilt. +- BZ#3442: COPY INTO ... LOCKED reports incorrect count +- BZ#3443: DROP INDEX crashes server with BATsubselect: invalid argument: + b must have a dense head +- BZ#3444: AND after ON () of LEFT OUTER JOIN with certain expressions + will cause crash + +* Fri Feb 28 2014 Sjoerd Mullender <[email protected]> - 11.17.11-20140303 +- buildtools: Configure now enables the SQL front end by default. + +* Sun Feb 16 2014 Fabian Groffen <[email protected]> - 11.17.11-20140303 +- merovingian: monetdb destroy -f now also works on running databases + * Thu Feb 13 2014 Sjoerd Mullender <[email protected]> - 11.17.9-20140213 - Rebuilt. - BZ#3435: INDEX prevents JOIN from discovering matches diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Feb 28 2014 Sjoerd Mullender <[email protected]> - 11.17.11-20140303 +- Configure now enables the SQL front end by default. + * Tue Dec 10 2013 Sjoerd Mullender <[email protected]> - 11.17.1-20140114 - Created packages for RPM based systems and Debian/Ubunty containing the MonetDB interface to the GNU Scientific Library (gsl). diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014 --- a/buildtools/ChangeLog.Jan2014 +++ b/buildtools/ChangeLog.Jan2014 @@ -1,6 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Fri Feb 28 2014 Sjoerd Mullender <[email protected]> -- Configure now enables the SQL front end by default. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +monetdb (11.17.11-20140303) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Mon, 03 Mar 2014 12:31:43 +0100 + +monetdb (11.17.11-20140303) unstable; urgency=low + + * Rebuilt. + * BZ#3442: COPY INTO ... LOCKED reports incorrect count + * BZ#3443: DROP INDEX crashes server with BATsubselect: invalid argument: + b must have a dense head + * BZ#3444: AND after ON () of LEFT OUTER JOIN with certain expressions + will cause crash + + -- Sjoerd Mullender <[email protected]> Mon, 03 Mar 2014 12:31:41 +0100 + +monetdb (11.17.11-20140303) unstable; urgency=low + + * buildtools: Configure now enables the SQL front end by default. + + -- Sjoerd Mullender <[email protected]> Fri, 28 Feb 2014 12:31:41 +0100 + +monetdb (11.17.11-20140303) unstable; urgency=low + + * merovingian: monetdb destroy -f now also works on running databases + + -- Fabian Groffen <[email protected]> Sun, 16 Feb 2014 12:31:41 +0100 + monetdb (11.17.9-20140213) unstable; urgency=low * Rebuilt. 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=10:4:0 +GDK_VERSION=10:5:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:5:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=16:4:0 +MONETDB5_VERSION=16:5:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=5:1:0 diff --git a/tools/merovingian/ChangeLog-Archive b/tools/merovingian/ChangeLog-Archive --- a/tools/merovingian/ChangeLog-Archive +++ b/tools/merovingian/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Sun Feb 16 2014 Fabian Groffen <[email protected]> - 11.17.11-20140303 +- monetdb destroy -f now also works on running databases + * Fri Nov 15 2013 Fabian Groffen <[email protected]> - 11.15.19-20131120 - monetdbd(1) now refuses to startup if it cannot read the properties from the dbfarm, bug #3398 diff --git a/tools/merovingian/ChangeLog.Jan2014 b/tools/merovingian/ChangeLog.Jan2014 --- a/tools/merovingian/ChangeLog.Jan2014 +++ b/tools/merovingian/ChangeLog.Jan2014 @@ -1,6 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Sun Feb 16 2014 Fabian Groffen <[email protected]> -- monetdb destroy -f now also works on running databases - _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
