Changeset: 7a5357cfa8ed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a5357cfa8ed Modified Files: .hgtags MonetDB.spec clients/ChangeLog-Archive clients/ChangeLog.Jul2012 debian/changelog java/ChangeLog-Archive java/ChangeLog.Jul2012 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jul2012 tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Jul2012 Branch: default Log Message:
Merge with Jul2012 branch. diffs (235 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -492,3 +492,5 @@ 8189deaa7dd5956a9bd6d0579519b6872eea2925 bccc66e2bdff8af6b7568a78ca47bdde894dcc55 Jul2012_5 8189deaa7dd5956a9bd6d0579519b6872eea2925 Jul2012_release e89d2bbb01411ab72a2902d60b364427565d4a44 Jul2012_release +8d673fe2015149fe44c2ba2d048aae50da6eb48e Jul2012_7 +322e81ffa03687b5be8c37208cdd6808d1347091 Jul2012_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/Jul2012/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2012-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -679,6 +679,31 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Mon Aug 13 2012 Sjoerd Mullender <[email protected]> - 11.11.7-20120813 +- Rebuilt. + +* Thu Aug 2 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- merovingian: Starting a server now waits for as long as the server needs to possibly + recover, bug #3134. In case of a long wait, the monetdbd logfile + gives extra information on what the server is doing to recover. +- merovingian: Fixed a crash of monetdbd when local databases were unshared, bug #3135 + +* Thu Aug 2 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- monetdb5: The server now distinguishes between starting and started states, + such that monetdbd can wait for it to finish starting. + +* Fri Jul 20 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- java: Fixed adaptive cache size used when retrieving results, not to cause + divide by zero errors when memory gets short, bug #3119. + +* Wed Jul 18 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- merovingian: Resolved a problem where automatic starting of a database initiated by + multiple clients at the same time could cause failed starts. Bug #3107 + +* Tue Jul 17 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- clients: mclient no longer prints the SQLSTATE at the start of each error + returned by the SQL-server. + * Tue Jul 10 2012 Fabian Groffen <[email protected]> - 11.11.5-20120710 - Rebuilt. 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 +* Tue Jul 17 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- mclient no longer prints the SQLSTATE at the start of each error + returned by the SQL-server. + * Fri Jun 29 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706 - ODBC: Fixed a bug where SQLNativeSql expected a statment handle instead of a connection handle. 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 -* Tue Jul 17 2012 Fabian Groffen <[email protected]> -- mclient no longer prints the SQLSTATE at the start of each error - returned by the SQL-server. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,46 @@ +monetdb (11.11.7-20120813) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Mon, 13 Aug 2012 11:31:44 +0200 + +monetdb (11.11.7-20120813) unstable; urgency=low + + * merovingian: Starting a server now waits for as long as the server needs to possibly + recover, bug #3134. In case of a long wait, the monetdbd logfile + gives extra information on what the server is doing to recover. + * merovingian: Fixed a crash of monetdbd when local databases were unshared, bug #3135 + + -- Fabian Groffen <[email protected]> Thu, 2 Aug 2012 11:31:44 +0200 + +monetdb (11.11.7-20120813) unstable; urgency=low + + * monetdb5: The server now distinguishes between starting and started states, + such that monetdbd can wait for it to finish starting. + + -- Fabian Groffen <[email protected]> Thu, 2 Aug 2012 11:31:44 +0200 + +monetdb (11.11.7-20120813) unstable; urgency=low + + * java: Fixed adaptive cache size used when retrieving results, not to cause + divide by zero errors when memory gets short, bug #3119. + + -- Fabian Groffen <[email protected]> Fri, 20 Jul 2012 11:31:44 +0200 + +monetdb (11.11.7-20120813) unstable; urgency=low + + * merovingian: Resolved a problem where automatic starting of a database initiated by + multiple clients at the same time could cause failed starts. Bug #3107 + + -- Fabian Groffen <[email protected]> Wed, 18 Jul 2012 11:31:44 +0200 + +monetdb (11.11.7-20120813) unstable; urgency=low + + * clients: mclient no longer prints the SQLSTATE at the start of each error + returned by the SQL-server. + + -- Fabian Groffen <[email protected]> Tue, 17 Jul 2012 11:31:44 +0200 + monetdb (11.11.5-20120710) unstable; urgency=low * Rebuilt. diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive --- a/java/ChangeLog-Archive +++ b/java/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Jul 20 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- Fixed adaptive cache size used when retrieving results, not to cause + divide by zero errors when memory gets short, bug #3119. + * Fri Mar 2 2012 Wouter Alink <[email protected]> - 11.9.1-20120418 - Password reading by JdbcClient no longer results in strange artifacts - JdbcClient now returns exit code 1 in case of failures diff --git a/java/ChangeLog.Jul2012 b/java/ChangeLog.Jul2012 --- a/java/ChangeLog.Jul2012 +++ b/java/ChangeLog.Jul2012 @@ -1,7 +1,3 @@ # ChangeLog file for java # This file is updated with Maddlog -* Fri Jul 20 2012 Fabian Groffen <[email protected]> -- Fixed adaptive cache size used when retrieving results, not to cause - divide by zero errors when memory gets short, bug #3119. - 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=6:0:0 +GDK_VERSION=7:0:1 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:2:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=12:0:0 +MONETDB5_VERSION=12:1:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=4:2:1 +STREAM_VERSION=4:3:1 diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive --- a/monetdb5/ChangeLog-Archive +++ b/monetdb5/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Aug 2 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- The server now distinguishes between starting and started states, + such that monetdbd can wait for it to finish starting. + * Thu Jun 14 2012 Fabian Groffen <[email protected]> - 11.11.1-20120706 - Crackers code has been removed. Development continues in the holindex branch. diff --git a/monetdb5/ChangeLog.Jul2012 b/monetdb5/ChangeLog.Jul2012 --- a/monetdb5/ChangeLog.Jul2012 +++ b/monetdb5/ChangeLog.Jul2012 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Thu Aug 2 2012 Fabian Groffen <[email protected]> -- The server now distinguishes between starting and started states, - such that monetdbd can wait for it to finish starting. - 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,16 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Aug 2 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- Starting a server now waits for as long as the server needs to possibly + recover, bug #3134. In case of a long wait, the monetdbd logfile + gives extra information on what the server is doing to recover. +- Fixed a crash of monetdbd when local databases were unshared, bug #3135 + +* Wed Jul 18 2012 Fabian Groffen <[email protected]> - 11.11.7-20120813 +- Resolved a problem where automatic starting of a database initiated by + multiple clients at the same time could cause failed starts. Bug #3107 + * Sat Jul 7 2012 Fabian Groffen <[email protected]> - 11.11.3-20120709 - Fixed misc memory leaks, which caused monetdbd to grow in memory size over time. diff --git a/tools/merovingian/ChangeLog.Jul2012 b/tools/merovingian/ChangeLog.Jul2012 --- a/tools/merovingian/ChangeLog.Jul2012 +++ b/tools/merovingian/ChangeLog.Jul2012 @@ -1,13 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Thu Aug 2 2012 Fabian Groffen <[email protected]> -- Starting a server now waits for as long as the server needs to possibly - recover, bug #3134. In case of a long wait, the monetdbd logfile - gives extra information on what the server is doing to recover. -- Fixed a crash of monetdbd when local databases were unshared, bug #3135 - -* Wed Jul 18 2012 Fabian Groffen <[email protected]> -- Resolved a problem where automatic starting of a database initiated by - multiple clients at the same time could cause failed starts. Bug #3107 - _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
