Changeset: 24ee6edbf335 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24ee6edbf335 Modified Files: .hgtags MonetDB.spec buildtools/ChangeLog-Archive buildtools/ChangeLog.Oct2012 clients/ChangeLog-Archive clients/ChangeLog.Oct2012 debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Oct2012 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Oct2012 tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Oct2012 Branch: default Log Message:
Merge with Oct2012 branch. diffs (300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -500,3 +500,5 @@ f21bc494423c56e9cb68bae0b400e1f2a6d0c2bc 3350908e3e6786034cea69f151e22f841eb3b49a Jul2012_11 f21bc494423c56e9cb68bae0b400e1f2a6d0c2bc Jul2012_SP2_release f8e913e56b99223764b1c22f526087d6bcad2656 Jul2012_SP2_release +2d08000a18ddbe8f2cc3f12e09b6def8e53ae53a Oct2012_1 +4233be3c7f49f704e5ed466d2c1836c9dcfbb9f7 Oct2012_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,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/Jul2012-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2012/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -695,6 +695,41 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Wed Oct 10 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.1-20121010 +- Rebuilt. + +* Tue Oct 9 2012 Fabian Groffen <fab...@cwi.nl> - 11.13.1-20121010 +- merovingian: Fixed problem where monetdbd would refuse to startup when discovery + was set to false, bug #3155 + +* Tue Sep 25 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 +- monetdb5: Removed module attach since it wasn't used or even tested. + +* Mon Sep 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.13.1-20121010 +- clients: mclient now accepts URIs as database to connect to. + +* Mon Sep 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.13.1-20121010 +- monetdb5: The MAL-to-C Compiler (mcc) was removed. The code wasn't tested and + most likely non-functional. + +* Mon Sep 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 +- gdk: Removed the gdk_embedded (and embedded) option. The code wasn't tested + and most likely non-functional. + +* Mon Sep 17 2012 Gijs Molenaar <g.j.molen...@uva.nl> - 11.13.1-20121010 +- clients: all strings returned by python2 are unicode, removed use_unicode option +- clients: python2 and 3 type convertion speed improvements +- clients: python2 uses new styl objects now (bug #3104) +- clients: split python2 and python3 + +* Mon Sep 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 +- gdk: BAT-of-BATs is no longer allowed. It was already not allowed to + make these types of BATs persistent, but now they can't be created at + all anymore. + +* Mon Sep 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 +- buildtools: Removed --enable-noexpand configure option. + * Mon Sep 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.11-20120917 - Rebuilt. 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 +* Mon Jul 16 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 +- Removed --enable-noexpand configure option. + * Mon Jul 2 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 - Created seperate RPM and DEB packages for MonetDB/JAQL. diff --git a/buildtools/ChangeLog.Oct2012 b/buildtools/ChangeLog.Oct2012 --- a/buildtools/ChangeLog.Oct2012 +++ b/buildtools/ChangeLog.Oct2012 @@ -1,6 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Mon Jul 16 2012 Sjoerd Mullender <sjo...@acm.org> -- Removed --enable-noexpand configure option. - diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,15 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Sep 4 2012 Fabian Groffen <fab...@cwi.nl> - 11.13.1-20121010 +- mclient now accepts URIs as database to connect to. + +* Thu Jul 19 2012 Gijs Molenaar <g.j.molen...@uva.nl> - 11.13.1-20121010 +- all strings returned by python2 are unicode, removed use_unicode option +- python2 and 3 type convertion speed improvements +- python2 uses new styl objects now (bug #3104) +- split python2 and python3 + * Tue Jul 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813 - mclient no longer prints the SQLSTATE at the start of each error returned by the SQL-server. diff --git a/clients/ChangeLog.Oct2012 b/clients/ChangeLog.Oct2012 --- a/clients/ChangeLog.Oct2012 +++ b/clients/ChangeLog.Oct2012 @@ -1,12 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Tue Sep 4 2012 Fabian Groffen <fab...@cwi.nl> -- mclient now accepts URIs as database to connect to. - -* Thu Jul 19 2012 Gijs Molenaar <g.j.molen...@uva.nl> -- all strings returned by python2 are unicode, removed use_unicode option -- python2 and 3 type convertion speed improvements -- python2 uses new styl objects now (bug #3104) -- split python2 and python3 - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,65 @@ +monetdb (11.13.1-20121010) unstable; urgency=low + + * Rebuilt. + + -- Fabian Groffen <fab...@monetdb.org> Wed, 10 Oct 2012 11:31:56 +0200 + +monetdb (11.13.1-20121010) unstable; urgency=low + + * merovingian: Fixed problem where monetdbd would refuse to startup when discovery + was set to false, bug #3155 + + -- Fabian Groffen <fab...@cwi.nl> Tue, 9 Oct 2012 11:31:55 +0200 + +monetdb (11.13.1-20121010) unstable; urgency=low + + * monetdb5: Removed module attach since it wasn't used or even tested. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 25 Sep 2012 11:31:55 +0200 + +monetdb (11.13.1-20121010) unstable; urgency=low + + * clients: mclient now accepts URIs as database to connect to. + + -- Fabian Groffen <fab...@cwi.nl> Mon, 17 Sep 2012 11:31:55 +0200 + +monetdb (11.13.1-20121010) unstable; urgency=low + + * monetdb5: The MAL-to-C Compiler (mcc) was removed. The code wasn't tested and + most likely non-functional. + + -- Fabian Groffen <fab...@cwi.nl> Mon, 17 Sep 2012 11:31:55 +0200 + +monetdb (11.13.1-20121010) unstable; urgency=low + + * gdk: Removed the gdk_embedded (and embedded) option. The code wasn't tested + and most likely non-functional. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 17 Sep 2012 11:31:55 +0200 + +monetdb (11.13.1-20121010) unstable; urgency=low + + * clients: all strings returned by python2 are unicode, removed use_unicode option + * clients: python2 and 3 type convertion speed improvements + * clients: python2 uses new styl objects now (bug #3104) + * clients: split python2 and python3 + + -- Gijs Molenaar <g.j.molen...@uva.nl> Mon, 17 Sep 2012 11:31:55 +0200 + +monetdb (11.13.1-20121010) unstable; urgency=low + + * gdk: BAT-of-BATs is no longer allowed. It was already not allowed to + make these types of BATs persistent, but now they can't be created at + all anymore. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 17 Sep 2012 11:31:55 +0200 + +monetdb (11.13.1-20121010) unstable; urgency=low + + * buildtools: Removed --enable-noexpand configure option. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 17 Sep 2012 11:31:55 +0200 + monetdb (11.11.11-20120917) 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,15 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Aug 8 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 +- Removed the gdk_embedded (and embedded) option. The code wasn't tested + and most likely non-functional. + +* Tue Jul 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 +- BAT-of-BATs is no longer allowed. It was already not allowed to + make these types of BATs persistent, but now they can't be created at + all anymore. + * Fri Aug 31 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.9-20120911 - Fixed a bug in BATantijoin when either side is a singleton BAT. This fixes bug 3139. diff --git a/gdk/ChangeLog.Oct2012 b/gdk/ChangeLog.Oct2012 --- a/gdk/ChangeLog.Oct2012 +++ b/gdk/ChangeLog.Oct2012 @@ -1,12 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Wed Aug 8 2012 Sjoerd Mullender <sjo...@acm.org> -- Removed the gdk_embedded (and embedded) option. The code wasn't tested - and most likely non-functional. - -* Tue Jul 17 2012 Sjoerd Mullender <sjo...@acm.org> -- BAT-of-BATs is no longer allowed. It was already not allowed to - make these types of BATs persistent, but now they can't be created at - all anymore. - 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=7:2:1 +GDK_VERSION=8:0:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:4:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=12:3:0 +MONETDB5_VERSION=13:0:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=4:5:1 diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive --- a/monetdb5/ChangeLog-Archive +++ b/monetdb5/ChangeLog-Archive @@ -1,6 +1,13 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Sep 25 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 +- Removed module attach since it wasn't used or even tested. + +* Wed Aug 8 2012 Fabian Groffen <fab...@cwi.nl> - 11.13.1-20121010 +- The MAL-to-C Compiler (mcc) was removed. The code wasn't tested and + most likely non-functional. + * Fri Sep 7 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.9-20120911 - Changed the way nclients maximum was calculated to avoid 'out of client slots' errors way before the maximum was reached. diff --git a/monetdb5/ChangeLog.Oct2012 b/monetdb5/ChangeLog.Oct2012 --- a/monetdb5/ChangeLog.Oct2012 +++ b/monetdb5/ChangeLog.Oct2012 @@ -1,10 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Tue Sep 25 2012 Sjoerd Mullender <sjo...@acm.org> -- Removed module attach since it wasn't used or even tested. - -* Wed Aug 8 2012 Fabian Groffen <fab...@cwi.nl> -- The MAL-to-C Compiler (mcc) was removed. The code wasn't tested and - most likely non-functional. - 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,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Oct 9 2012 Fabian Groffen <fab...@cwi.nl> - 11.13.1-20121010 +- Fixed problem where monetdbd would refuse to startup when discovery + was set to false, bug #3155 + * Fri Aug 31 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.9-20120911 - Resolved a problem where monetdb could fail to start a database with the message "database 'X' started up, but failed to open up a diff --git a/tools/merovingian/ChangeLog.Oct2012 b/tools/merovingian/ChangeLog.Oct2012 --- a/tools/merovingian/ChangeLog.Oct2012 +++ b/tools/merovingian/ChangeLog.Oct2012 @@ -1,7 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Tue Oct 9 2012 Fabian Groffen <fab...@cwi.nl> -- Fixed problem where monetdbd would refuse to startup when discovery - was set to false, bug #3155 - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
