Changeset: 73b89956d3e1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73b89956d3e1 Modified Files: 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 gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: default Log Message:
Merged from Dec2011 diffs (116 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -459,5 +459,3 @@ 477cc2a87348df99b4eab237501d1113e5cb21d8 5ab2786b8f740c3e9fd1578605cec2bcd7725bc2 Aug2011_7 477cc2a87348df99b4eab237501d1113e5cb21d8 Aug2011_SP2_release f022d32377c51b00599ecb014a72ea7ea2d6b8ba Aug2011_SP2_release -ac3f3d4d8a52e2e2839632b6927f242f64d77823 Aug2011_9 -17f19b9f9fa866ff449a626080761d3c73638f9a Aug2011_SP3_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/Aug2011-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Aug2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -625,17 +625,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog -* Fri Nov 11 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.9-20111111 -- Rebuilt. - -* Sun Nov 6 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.9-20111111 -- merovingian: Fixed a bug where monetdbd's socket files from /tmp were removed when - a second monetdbd was attempted to be started using the same port. - -* Wed Oct 26 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.9-20111111 -- sql: Added a fix for bug #2834, which caused weird (failing) behaviour - with PreparedStatements. - * Fri Oct 21 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.7-20111021 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,23 +1,3 @@ -monetdb (11.5.9-20111111) unstable; urgency=low - - * Rebuilt. - - -- Fabian Groffen <fab...@cwi.nl> Fri, 11 Nov 2011 09:33:19 +0100 - -monetdb (11.5.9-20111111) unstable; urgency=low - - * merovingian: Fixed a bug where monetdbd's socket files from /tmp were removed when - a second monetdbd was attempted to be started using the same port. - - -- Fabian Groffen <fab...@cwi.nl> Sun, 6 Nov 2011 09:33:18 +0100 - -monetdb (11.5.9-20111111) unstable; urgency=low - - * sql: Added a fix for bug #2834, which caused weird (failing) behaviour - with PreparedStatements. - - -- Fabian Groffen <fab...@cwi.nl> Wed, 26 Oct 2011 09:33:18 +0100 - monetdb (11.5.7-20111021) unstable; urgency=low * Rebuilt. diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive --- a/sql/ChangeLog-Archive +++ b/sql/ChangeLog-Archive @@ -1,10 +1,6 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries -* Wed Oct 26 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.9-20111111 -- Added a fix for bug #2834, which caused weird (failing) behaviour - with PreparedStatements. - * Wed Sep 21 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.3-20110925 - Fixed a bug when using default values for interval columns. Bug 2877. diff --git a/sql/ChangeLog.Aug2011 b/sql/ChangeLog.Aug2011 --- a/sql/ChangeLog.Aug2011 +++ b/sql/ChangeLog.Aug2011 @@ -1,3 +1,7 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Wed Oct 26 2011 Fabian Groffen <fab...@cwi.nl> +- Added a fix for bug #2834, which caused weird (failing) behaviour + with PreparedStatements. + diff --git a/tools/merovingian/ChangeLog-Archive b/tools/merovingian/ChangeLog-Archive --- a/tools/merovingian/ChangeLog-Archive +++ b/tools/merovingian/ChangeLog-Archive @@ -1,10 +1,6 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries -* Sun Nov 6 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.9-20111111 -- Fixed a bug where monetdbd's socket files from /tmp were removed when - a second monetdbd was attempted to be started using the same port. - * Sun Oct 9 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018 - Resolved problem where monetdbd would terminate abnormally when databases named 'control', 'discovery' or 'merovingian' were stopped. diff --git a/tools/merovingian/ChangeLog.Aug2011 b/tools/merovingian/ChangeLog.Aug2011 --- a/tools/merovingian/ChangeLog.Aug2011 +++ b/tools/merovingian/ChangeLog.Aug2011 @@ -1,3 +1,7 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog +* Sun Nov 6 2011 Fabian Groffen <fab...@cwi.nl> +- Fixed a bug where monetdbd's socket files from /tmp were removed when + a second monetdbd was attempted to be started using the same port. + _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
