Changeset: 874d05ee4560 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=874d05ee4560 Added Files: debian/libmonetdb6.install Removed Files: buildtools/ChangeLog.Apr2012 clients/ChangeLog.Apr2012 debian/libmonetdb4.install gdk/ChangeLog.Apr2012 geom/ChangeLog.Apr2012 java/ChangeLog.Apr2012 monetdb5/ChangeLog.Apr2012 sql/ChangeLog.Apr2012 testing/ChangeLog.Apr2012 tools/merovingian/ChangeLog.Apr2012 Modified Files: .hgtags MonetDB.spec buildtools/ChangeLog-Archive buildtools/ChangeLog.Jul2012 clients/ChangeLog-Archive clients/ChangeLog.Jul2012 debian/changelog debian/control gdk/ChangeLog-Archive gdk/ChangeLog.Jul2012 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jul2012 sql/ChangeLog-Archive sql/ChangeLog.Jul2012 tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Jul2012 Branch: default Log Message:
Merge with Jul2012 branch. diffs (truncated from 445 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -484,3 +484,5 @@ ebb4a17093e63a199a1d5d27855aa8a31c7e7785 06c3e1846c2fc399d72edcac1ed0d877934fab67 Jun2012_root 94ffb491c3f2a9dc47c1371760b928bb7d35c050 Apr2012_7 95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release +99c533046fba872cd4c23cf9a64a0e54d61f6bae Jul2012_1 +6cc0a74a5518ce234159fadebcc82976165a5200 Jul2012_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/Apr2012-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2012/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -679,6 +679,48 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Fri Jul 06 2012 Fabian Groffen <fab...@monetdb.org> - 11.11.1-20120706 +- Rebuilt. + +* Mon Jul 2 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- buildtools: Created seperate RPM and DEB packages for MonetDB/JAQL. + +* Fri Jun 29 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.1-20120706 +- sql: COPY INTO now accepts optional parenthesis for file argument. + Binary COPY INTO now requires 'COPY BINARY INTO'. + +* Fri Jun 29 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- clients: ODBC: Fixed a bug where SQLNativeSql expected a statment handle instead + of a connection handle. + +* Thu Jun 14 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.1-20120706 +- monetdb5: Crackers code has been removed. Development continues in the holindex + branch. + +* Wed Jun 13 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.1-20120706 +- merovingian: Removed erroneously (re-)added master and slave properties, this + functionality is currently not working. + +* Thu Jun 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- buildtools: Removed --enable-bits option from configure. + +* Thu Jun 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- buildtools: Split the MonetDB-client-ruby RPM package into two and named them in + accordance with the Fedora packaging guidelines as rubygem-<gem-name>. + +* Thu Jun 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- gdk: The sorted property, which was used to maintain whether a column in + a BAT was sorted or reverse sorted, has been replaced by a pair of + properties, sorted and revsorted. These new properties can be set + independently (unlike the old sorted property), and so if both are set, + the column must be constant. In addition, internal property checking + has been overhauled. Now, when a property is set incorrectly, and + when assertions are enabled, an assertion will go off. There is also + a function which can derive properties. + +* Thu Jun 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- gdk: Implemented proper overflow checking on all arithmetic operations. + * Thu Jun 07 2012 Sjoerd Mullender <sjo...@acm.org> - 11.9.7-20120607 - Rebuilt. diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,16 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Jul 2 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- Created seperate RPM and DEB packages for MonetDB/JAQL. + +* Tue Jun 5 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- Removed --enable-bits option from configure. + +* Thu Apr 19 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- Split the MonetDB-client-ruby RPM package into two and named them in + accordance with the Fedora packaging guidelines as rubygem-<gem-name>. + * Wed May 2 2012 Sjoerd Mullender <sjo...@acm.org> - 11.9.3-20120514 - Windows: we now use OpenSSL 1.0.1b. diff --git a/buildtools/ChangeLog.Apr2012 b/buildtools/ChangeLog.Apr2012 deleted file mode 100644 --- a/buildtools/ChangeLog.Apr2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for buildtools -# This file is updated with Maddlog - diff --git a/buildtools/ChangeLog.Jul2012 b/buildtools/ChangeLog.Jul2012 --- a/buildtools/ChangeLog.Jul2012 +++ b/buildtools/ChangeLog.Jul2012 @@ -1,13 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Mon Jul 2 2012 Sjoerd Mullender <sjo...@acm.org> -- Created seperate RPM and DEB packages for MonetDB/JAQL. - -* Tue Jun 5 2012 Sjoerd Mullender <sjo...@acm.org> -- Removed --enable-bits option from configure. - -* Thu Apr 19 2012 Sjoerd Mullender <sjo...@acm.org> -- Split the MonetDB-client-ruby RPM package into two and named them in - accordance with the Fedora packaging guidelines as rubygem-<gem-name>. - diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Jun 29 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- ODBC: Fixed a bug where SQLNativeSql expected a statment handle instead + of a connection handle. + * Wed May 23 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.7-20120607 - Resolved a cosmetical error where tab-characters would cause misalignments in tabular result views. For the time being, tabs are diff --git a/clients/ChangeLog.Apr2012 b/clients/ChangeLog.Apr2012 deleted file mode 100644 --- a/clients/ChangeLog.Apr2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - diff --git a/clients/ChangeLog.Jul2012 b/clients/ChangeLog.Jul2012 --- a/clients/ChangeLog.Jul2012 +++ b/clients/ChangeLog.Jul2012 @@ -1,7 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Fri Jun 29 2012 Sjoerd Mullender <sjo...@acm.org> -- ODBC: Fixed a bug where SQLNativeSql expected a statment handle instead - of a connection handle. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,75 @@ +monetdb (11.11.1-20120706) unstable; urgency=low + + * Rebuilt. + + -- Fabian Groffen <fab...@monetdb.org> Fri, 06 Jul 2012 11:02:22 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * buildtools: Created seperate RPM and DEB packages for MonetDB/JAQL. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 2 Jul 2012 11:02:20 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * sql: COPY INTO now accepts optional parenthesis for file argument. + Binary COPY INTO now requires 'COPY BINARY INTO'. + + -- Fabian Groffen <fab...@cwi.nl> Fri, 29 Jun 2012 11:02:20 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * clients: ODBC: Fixed a bug where SQLNativeSql expected a statment handle instead + of a connection handle. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 29 Jun 2012 11:02:20 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * monetdb5: Crackers code has been removed. Development continues in the holindex + branch. + + -- Fabian Groffen <fab...@cwi.nl> Thu, 14 Jun 2012 11:02:20 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * merovingian: Removed erroneously (re-)added master and slave properties, this + functionality is currently not working. + + -- Fabian Groffen <fab...@cwi.nl> Wed, 13 Jun 2012 11:02:20 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * buildtools: Removed --enable-bits option from configure. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 7 Jun 2012 11:02:20 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * buildtools: Split the MonetDB-client-ruby RPM package into two and named them in + accordance with the Fedora packaging guidelines as rubygem-<gem-name>. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 7 Jun 2012 11:02:20 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * gdk: The sorted property, which was used to maintain whether a column in + a BAT was sorted or reverse sorted, has been replaced by a pair of + properties, sorted and revsorted. These new properties can be set + independently (unlike the old sorted property), and so if both are set, + the column must be constant. In addition, internal property checking + has been overhauled. Now, when a property is set incorrectly, and + when assertions are enabled, an assertion will go off. There is also + a function which can derive properties. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 7 Jun 2012 11:02:20 +0200 + +monetdb (11.11.1-20120706) unstable; urgency=low + + * gdk: Implemented proper overflow checking on all arithmetic operations. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 7 Jun 2012 11:02:20 +0200 + monetdb (11.9.7-20120607) unstable; urgency=low * Rebuilt. diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), autotoo # Build-Depends: libraptor1-dev Standards-Version: 3.8.0 -Package: libmonetdb4 +Package: libmonetdb6 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libmonetdb1, libmonetdb2, libmonetdb-dev diff --git a/debian/libmonetdb4.install b/debian/libmonetdb6.install rename from debian/libmonetdb4.install rename to debian/libmonetdb6.install diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,19 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Apr 4 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- The sorted property, which was used to maintain whether a column in + a BAT was sorted or reverse sorted, has been replaced by a pair of + properties, sorted and revsorted. These new properties can be set + independently (unlike the old sorted property), and so if both are set, + the column must be constant. In addition, internal property checking + has been overhauled. Now, when a property is set incorrectly, and + when assertions are enabled, an assertion will go off. There is also + a function which can derive properties. + +* Thu Mar 15 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706 +- Implemented proper overflow checking on all arithmetic operations. + * Thu May 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.7-20120607 - Limit number of detected CPU cores to 16 on 32-bits systems to avoid running quickly out of addressable resources followed by a kill from diff --git a/gdk/ChangeLog.Apr2012 b/gdk/ChangeLog.Apr2012 deleted file mode 100644 --- a/gdk/ChangeLog.Apr2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for MonetDB -# This file is updated with Maddlog - diff --git a/gdk/ChangeLog.Jul2012 b/gdk/ChangeLog.Jul2012 --- a/gdk/ChangeLog.Jul2012 +++ b/gdk/ChangeLog.Jul2012 @@ -1,16 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Wed Apr 4 2012 Sjoerd Mullender <sjo...@acm.org> -- The sorted property, which was used to maintain whether a column in - a BAT was sorted or reverse sorted, has been replaced by a pair of - properties, sorted and revsorted. These new properties can be set - independently (unlike the old sorted property), and so if both are set, - the column must be constant. In addition, internal property checking - has been overhauled. Now, when a property is set incorrectly, and - when assertions are enabled, an assertion will go off. There is also - a function which can derive properties. - -* Thu Mar 15 2012 Sjoerd Mullender <sjo...@acm.org> -- Implemented proper overflow checking on all arithmetic operations. - diff --git a/geom/ChangeLog.Apr2012 b/geom/ChangeLog.Apr2012 deleted file mode 100644 --- a/geom/ChangeLog.Apr2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for geom -# This file is updated with Maddlog _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
