Changeset: 569cbdf7c6c8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=569cbdf7c6c8 Added Files: debian/libmonetdb9.install Removed Files: buildtools/ChangeLog.Oct2012 clients/ChangeLog.Oct2012 debian/libmonetdb8.install gdk/ChangeLog.Oct2012 geom/ChangeLog.Oct2012 java/ChangeLog.Oct2012 monetdb5/ChangeLog.Oct2012 sql/ChangeLog.Oct2012 testing/ChangeLog.Oct2012 tools/merovingian/ChangeLog.Oct2012 Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/ChangeLog-Archive clients/ChangeLog.Feb2013 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog debian/control gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Feb2013 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Feb2013 monetdb5/tools/libmonetdb5.rc testing/ChangeLog-Archive testing/ChangeLog.Feb2013 tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Feb2013 vertoo.data Branch: default Log Message:
Merge heads. diffs (truncated from 505 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -513,3 +513,5 @@ 0ef42179e99bbd8450d9993cf419fcbed96cf61c 14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release 0d23123db0a3fd8564564c46789e8e549320c77b Oct2012_9 1f74df406780bccca94e6128c6c62a0b101fc847 Oct2012_SP3_release +693187b90b57a610779caa942efe7514372125ee Feb2013_1 +23894afae1679eb37e6866a793ba00782c4b0804 Feb2013_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/Oct2012-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -722,6 +722,68 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Tue Feb 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212 +- Rebuilt. + +* Thu Jan 17 2013 Stefan Manegold <stefan.maneg...@cwi.nl> - 11.15.1-20130212 +- testing: +enabled "top-level" Mtest.py +So far, while Mtest.py could be called in any subdirectory of the MonetDB +source tree (and could then run all tests in the entire sub-tree), +it was not possible to call Mtest.py in the top-level MonetDB source +directory to run all tests. Instead, to run all tests, Mtest.py had to +be called at least 4 times, once in each of these directories: "clients", +"monetdb5", "sql", "geom". +Now, it is possible to call Mtest.py once in the top-level MonetDB source +directory to run all tests in one go. +The behaviour of calling Mtest.py in any subdirectory, including the +four mentioned above, did not changed, other than that now obsolete +command line options "-p / --package <package>" and "-5 / --monetdb5" +have been removed. + +* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 +- clients: Mapi protocol v8 support was removed from all client drivers. Protocol + v8 has not been used by the servers any more since Apr2012 release +- clients: The tool mnc was removed from installations + +* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 +- java: merocontrol was changed to return server URIs, and lastStop time. + Connections and dbpath were removed. +- java: Mapi protocol v8 support was removed from MapiSocket. Protocol + v8 has not been used by the servers any more since Apr2012 release + +* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 +- merovingian: Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped + +* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 +- merovingian: monetdb status now uses a more condensed output, to cater for the uris + being shown, and prints how long a database is stopped, or how long + ago it crashed + +* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 +- merovingian: monetdb status now prints the connection uri for each database, + when available. The connections and database path properties have + been dropped. + +* Tue Jan 15 2013 Fabian Groffen <fab...@cwi.nl> - 11.15.1-20130212 +- merovingian: monetdb status now prints last crash date only if the database has + not been started since. + +* Tue Jan 15 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212 +- monetdb5: mserver5: The --dbname and --dbfarm options have been replaced by the + single --dbpath option. + +* Tue Jan 15 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212 +- clients: msqldump: Implmented an option (--table/-t) to dump a single table. +- clients: Changed msqdump's trace option to be in line with mclient. In both + cases, the long option is --Xdebug and the short option is -X. + +* Tue Jan 15 2013 Martin Kersten <m...@cwi.nl> - 11.15.1-20130212 +- monetdb5: The scheduler of mserver5 was changed to use a fixed set of workers to + perform the work for all connected clients. Previously, each client + connection had its own set of workers, easily causing resource problems + upon multiple connections to the server. + * Tue Jan 15 2013 Sjoerd Mullender <sjo...@acm.org> - 11.13.9-20130115 - Rebuilt. diff --git a/buildtools/ChangeLog.Oct2012 b/buildtools/ChangeLog.Oct2012 deleted file mode 100644 --- a/buildtools/ChangeLog.Oct2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for buildtools -# This file is updated with Maddlog - diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,16 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 +- Mapi protocol v8 support was removed from all client drivers. Protocol + v8 has not been used by the servers any more since Apr2012 release +- The tool mnc was removed from installations + +* Wed Nov 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212 +- msqldump: Implmented an option (--table/-t) to dump a single table. +- Changed msqdump's trace option to be in line with mclient. In both + cases, the long option is --Xdebug and the short option is -X. + * Tue Sep 4 2012 Fabian Groffen <fab...@cwi.nl> - 11.13.1-20121010 - mclient now accepts URIs as database to connect to. diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013 --- a/clients/ChangeLog.Feb2013 +++ b/clients/ChangeLog.Feb2013 @@ -1,13 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> -- Mapi protocol v8 support was removed from all client drivers. Protocol - v8 has not been used by the servers any more since Apr2012 release -- The tool mnc was removed from installations - -* Wed Nov 7 2012 Sjoerd Mullender <sjo...@acm.org> -- msqldump: Implmented an option (--table/-t) to dump a single table. -- Changed msqdump's trace option to be in line with mclient. In both - cases, the long option is --Xdebug and the short option is -X. - diff --git a/clients/ChangeLog.Oct2012 b/clients/ChangeLog.Oct2012 deleted file mode 100644 --- a/clients/ChangeLog.Oct2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,98 @@ +monetdb (11.15.1-20130212) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 12 Feb 2013 09:51:41 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * testing: +enabled "top-level" Mtest.py +So far, while Mtest.py could be called in any subdirectory of the MonetDB +source tree (and could then run all tests in the entire sub-tree), +it was not possible to call Mtest.py in the top-level MonetDB source +directory to run all tests. Instead, to run all tests, Mtest.py had to +be called at least 4 times, once in each of these directories: "clients", +"monetdb5", "sql", "geom". +Now, it is possible to call Mtest.py once in the top-level MonetDB source +directory to run all tests in one go. +The behaviour of calling Mtest.py in any subdirectory, including the +four mentioned above, did not changed, other than that now obsolete +command line options "-p / --package <package>" and "-5 / --monetdb5" +have been removed. + + -- Stefan Manegold <stefan.maneg...@cwi.nl> Thu, 17 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * clients: Mapi protocol v8 support was removed from all client drivers. Protocol + v8 has not been used by the servers any more since Apr2012 release + * clients: The tool mnc was removed from installations + + -- Fabian Groffen <fab...@monetdb.org> Tue, 15 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * java: merocontrol was changed to return server URIs, and lastStop time. + Connections and dbpath were removed. + * java: Mapi protocol v8 support was removed from MapiSocket. Protocol + v8 has not been used by the servers any more since Apr2012 release + + -- Fabian Groffen <fab...@monetdb.org> Tue, 15 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * merovingian: Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped + + -- Fabian Groffen <fab...@monetdb.org> Tue, 15 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * merovingian: monetdb status now uses a more condensed output, to cater for the uris + being shown, and prints how long a database is stopped, or how long + ago it crashed + + -- Fabian Groffen <fab...@monetdb.org> Tue, 15 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * merovingian: monetdb status now prints the connection uri for each database, + when available. The connections and database path properties have + been dropped. + + -- Fabian Groffen <fab...@monetdb.org> Tue, 15 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * merovingian: monetdb status now prints last crash date only if the database has + not been started since. + + -- Fabian Groffen <fab...@cwi.nl> Tue, 15 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * monetdb5: mserver5: The --dbname and --dbfarm options have been replaced by the + single --dbpath option. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 15 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * clients: msqldump: Implmented an option (--table/-t) to dump a single table. + * clients: Changed msqdump's trace option to be in line with mclient. In both + cases, the long option is --Xdebug and the short option is -X. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 15 Jan 2013 09:51:39 +0100 + +monetdb (11.15.1-20130212) unstable; urgency=low + + * monetdb5: The scheduler of mserver5 was changed to use a fixed set of workers to + perform the work for all connected clients. Previously, each client + connection had its own set of workers, easily causing resource problems + upon multiple connections to the server. + + -- Martin Kersten <m...@cwi.nl> Tue, 15 Jan 2013 09:51:39 +0100 + monetdb (11.13.9-20130115) unstable; urgency=low * Rebuilt. diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Standards-Version: 3.8.0 X-Python-Version: >= 2.6 X-Python3-Version: >= 3.0 -Package: libmonetdb8 +Package: libmonetdb9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libmonetdb1, libmonetdb2, libmonetdb-dev diff --git a/debian/libmonetdb8.install b/debian/libmonetdb9.install rename from debian/libmonetdb8.install rename to debian/libmonetdb9.install diff --git a/gdk/ChangeLog.Oct2012 b/gdk/ChangeLog.Oct2012 deleted file mode 100644 --- a/gdk/ChangeLog.Oct2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for MonetDB -# This file is updated with Maddlog - diff --git a/geom/ChangeLog.Oct2012 b/geom/ChangeLog.Oct2012 deleted file mode 100644 --- a/geom/ChangeLog.Oct2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for geom -# This file is updated with Maddlog - diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive --- a/java/ChangeLog-Archive +++ b/java/ChangeLog-Archive @@ -1,6 +1,12 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 +- merocontrol was changed to return server URIs, and lastStop time. + Connections and dbpath were removed. +- Mapi protocol v8 support was removed from MapiSocket. Protocol + v8 has not been used by the servers any more since Apr2012 release + * Fri Nov 23 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.7-20121212 - Implemented type map support of Connection to allow custom mapping of UDTs to Java classes. By default the INET and URL UDTs are diff --git a/java/ChangeLog.Feb2013 b/java/ChangeLog.Feb2013 --- a/java/ChangeLog.Feb2013 +++ b/java/ChangeLog.Feb2013 @@ -1,9 +1,3 @@ # ChangeLog file for java # This file is updated with Maddlog -* Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
