Changeset: 53afeda2cd61 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53afeda2cd61 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/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python/setup.py configure.ag debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Jul2012 gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Jul2012 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jul2012 monetdb5/tools/libmonetdb5.rc tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Jul2012 vertoo.data Branch: default Log Message:
Merge with Oct2012 branch. diffs (214 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -495,3 +495,5 @@ e89d2bbb01411ab72a2902d60b364427565d4a44 8d673fe2015149fe44c2ba2d048aae50da6eb48e Jul2012_7 322e81ffa03687b5be8c37208cdd6808d1347091 Jul2012_SP1_release e89e4367f1106e7bc85a0a37bbb5bccf655a493d Oct2012_root +4d73d1902798944fddc156f95c0d656d76cfc3d8 Jul2012_9 +f21bc494423c56e9cb68bae0b400e1f2a6d0c2bc Jul2012_SP2_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-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2012-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -695,6 +695,26 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Tue Sep 11 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.9-20120911 +- Rebuilt. + +* Fri Sep 7 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.9-20120911 +- monetdb5: Changed the way nclients maximum was calculated to avoid 'out of client + slots' errors way before the maximum was reached. + +* Fri Aug 31 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.9-20120911 +- merovingian: Resolved a problem where monetdb could fail to start a database with + the message "database 'X' started up, but failed to open up a + communication channel". Bug #3134, comment #7. + +* Fri Aug 31 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.9-20120911 +- gdk: Fixed a bug in BATantijoin when either side is a singleton BAT. + This fixes bug 3139. + +* Tue Aug 14 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.9-20120911 +- java: Fixed a bug where DatabaseMetaData.getURL() did return null:0 for + hostname:port. + * Mon Aug 13 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.7-20120813 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +monetdb (11.11.9-20120911) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 11 Sep 2012 10:33:30 +0200 + +monetdb (11.11.9-20120911) unstable; urgency=low + + * monetdb5: Changed the way nclients maximum was calculated to avoid 'out of client + slots' errors way before the maximum was reached. + + -- Fabian Groffen <fab...@cwi.nl> Fri, 7 Sep 2012 10:33:29 +0200 + +monetdb (11.11.9-20120911) unstable; urgency=low + + * merovingian: Resolved a problem where monetdb could fail to start a database with + the message "database 'X' started up, but failed to open up a + communication channel". Bug #3134, comment #7. + + -- Fabian Groffen <fab...@cwi.nl> Fri, 31 Aug 2012 10:33:29 +0200 + +monetdb (11.11.9-20120911) unstable; urgency=low + + * gdk: Fixed a bug in BATantijoin when either side is a singleton BAT. + This fixes bug 3139. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 31 Aug 2012 10:33:29 +0200 + +monetdb (11.11.9-20120911) unstable; urgency=low + + * java: Fixed a bug where DatabaseMetaData.getURL() did return null:0 for + hostname:port. + + -- Fabian Groffen <fab...@cwi.nl> Tue, 14 Aug 2012 10:33:29 +0200 + monetdb (11.11.7-20120813) 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,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* 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. + * Mon Jul 9 2012 Niels Nes <ni...@cwi.nl> - 11.11.5-20120710 - Fixed intermittent problem that joins and selects return incorrect results and possibly inconsistent databases. The problems only occurred diff --git a/gdk/ChangeLog.Jul2012 b/gdk/ChangeLog.Jul2012 --- a/gdk/ChangeLog.Jul2012 +++ b/gdk/ChangeLog.Jul2012 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Fri Aug 31 2012 Sjoerd Mullender <sjo...@acm.org> -- Fixed a bug in BATantijoin when either side is a singleton BAT. - This fixes bug 3139. - 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 +* Tue Aug 14 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.9-20120911 +- Fixed a bug where DatabaseMetaData.getURL() did return null:0 for + hostname:port. + * Fri Jul 20 2012 Fabian Groffen <fab...@cwi.nl> - 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. 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 -* Tue Aug 14 2012 Fabian Groffen <fab...@cwi.nl> -- Fixed a bug where DatabaseMetaData.getURL() did return null:0 for - hostname:port. - 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:0:1 +GDK_VERSION=7:1:1 # version of the MAPI library (subdirectory clients/mapilib) -MAPI_VERSION=6:2:0 +MAPI_VERSION=6:3:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=12:1:0 +MONETDB5_VERSION=12:2:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=4:3:1 +STREAM_VERSION=4:4: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 +* 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. + * Thu Aug 2 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813 - The server now distinguishes between starting and started states, such that monetdbd can wait for it to finish starting. 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 -* Fri Sep 7 2012 Fabian Groffen <fab...@cwi.nl> -- Changed the way nclients maximum was calculated to avoid 'out of client - slots' errors way before the maximum was reached. - 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,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* 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 + communication channel". Bug #3134, comment #7. + * Thu Aug 2 2012 Fabian Groffen <fab...@cwi.nl> - 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 diff --git a/tools/merovingian/ChangeLog.Jul2012 b/tools/merovingian/ChangeLog.Jul2012 --- a/tools/merovingian/ChangeLog.Jul2012 +++ b/tools/merovingian/ChangeLog.Jul2012 @@ -1,9 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Fri Aug 31 2012 Fabian Groffen <fab...@cwi.nl> -- Resolved a problem where monetdb could fail to start a database with - the message "database 'X' started up, but failed to open up a - communication channel". Bug #3134, comment #7. - - _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
