Changeset: e6ddb7189ee7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6ddb7189ee7 Modified Files: .hgtags MonetDB.spec debian/changelog java/ChangeLog-Archive java/ChangeLog.Oct2012 libversions sql/ChangeLog-Archive sql/ChangeLog.Oct2012 Branch: Feb2013 Log Message:
Merge with Oct2012 branch. diffs (170 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -509,3 +509,5 @@ 3c157ea4be5369d5718c7d578f10c0b934fbf2e6 55c1892e82a764a7a6003dded13a6228de3d1661 Oct2012_5 5ba19bc11f7691610501c95ba8d0f1d9e5083a94 Oct2012_SP1_release c341b78e1c2e38445f43bd3ec89fdf40792bed01 Feb2013_root +0ef42179e99bbd8450d9993cf419fcbed96cf61c Oct2012_7 +14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_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/Oct2012-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2012-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -692,6 +692,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Wed Dec 12 2012 Sjoerd Mullender <[email protected]> - 11.13.7-20121212 +- Rebuilt. + +* Fri Nov 23 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212 +- java: Implemented type map support of Connection to allow custom mapping + of UDTs to Java classes. By default the INET and URL UDTs are + now mapped to nl.cwi.monetdb.jdbc.types.{INET,URL}. Most notably, + ResultSet.getObject() and PreparedStatement.setObject() deal with the + type map. + +* Thu Nov 22 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212 +- java: Fixed a problem in PreparedStatement where the prepared statement's + ResultSetMetaData (on its columns to be produced) incorrectly threw + exceptions about non existing columns. Bug #3192 + +* Wed Nov 21 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212 +- sql: Fixed crash when performing an INSERT on a table with string-like column + defaulting to NULL and omitting that column from VALUES, bug #3168 + * Fri Nov 16 2012 Sjoerd Mullender <[email protected]> - 11.13.5-20121116 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,34 @@ +monetdb (11.13.7-20121212) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Wed, 12 Dec 2012 13:00:49 +0100 + +monetdb (11.13.7-20121212) unstable; urgency=low + + * java: Implemented type map support of Connection to allow custom mapping + of UDTs to Java classes. By default the INET and URL UDTs are + now mapped to nl.cwi.monetdb.jdbc.types.{INET,URL}. Most notably, + ResultSet.getObject() and PreparedStatement.setObject() deal with the + type map. + + -- Fabian Groffen <[email protected]> Fri, 23 Nov 2012 13:00:48 +0100 + +monetdb (11.13.7-20121212) unstable; urgency=low + + * java: Fixed a problem in PreparedStatement where the prepared statement's + ResultSetMetaData (on its columns to be produced) incorrectly threw + exceptions about non existing columns. Bug #3192 + + -- Fabian Groffen <[email protected]> Thu, 22 Nov 2012 13:00:48 +0100 + +monetdb (11.13.7-20121212) unstable; urgency=low + + * sql: Fixed crash when performing an INSERT on a table with string-like column + defaulting to NULL and omitting that column from VALUES, bug #3168 + + -- Fabian Groffen <[email protected]> Wed, 21 Nov 2012 13:00:48 +0100 + monetdb (11.13.5-20121116) 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,18 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Nov 23 2012 Fabian Groffen <[email protected]> - 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 + now mapped to nl.cwi.monetdb.jdbc.types.{INET,URL}. Most notably, + ResultSet.getObject() and PreparedStatement.setObject() deal with the + type map. + +* Thu Nov 22 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212 +- Fixed a problem in PreparedStatement where the prepared statement's + ResultSetMetaData (on its columns to be produced) incorrectly threw + exceptions about non existing columns. Bug #3192 + * Wed Oct 10 2012 Fabian Groffen <[email protected]> - 11.13.3-20121016 - Fixed problem with PreparedStatements and setXXX() methods using column numbers instead of names, bug #3158 diff --git a/java/ChangeLog.Oct2012 b/java/ChangeLog.Oct2012 --- a/java/ChangeLog.Oct2012 +++ b/java/ChangeLog.Oct2012 @@ -1,15 +1,3 @@ # ChangeLog file for java # This file is updated with Maddlog -* Fri Nov 23 2012 Fabian Groffen <[email protected]> -- Implemented type map support of Connection to allow custom mapping - of UDTs to Java classes. By default the INET and URL UDTs are - now mapped to nl.cwi.monetdb.jdbc.types.{INET,URL}. Most notably, - ResultSet.getObject() and PreparedStatement.setObject() deal with the - type map. - -* Thu Nov 22 2012 Fabian Groffen <[email protected]> -- Fixed a problem in PreparedStatement where the prepared statement's - ResultSetMetaData (on its columns to be produced) incorrectly threw - exceptions about non existing columns. Bug #3192 - 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=8:1:0 +GDK_VERSION=8:2:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:4:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=13:1:0 +MONETDB5_VERSION=13:2:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=4:5:1 diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive --- a/sql/ChangeLog-Archive +++ b/sql/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Nov 21 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212 +- Fixed crash when performing an INSERT on a table with string-like column + defaulting to NULL and omitting that column from VALUES, bug #3168 + * Fri Jun 29 2012 Fabian Groffen <[email protected]> - 11.11.1-20120706 - COPY INTO now accepts optional parenthesis for file argument. Binary COPY INTO now requires 'COPY BINARY INTO'. diff --git a/sql/ChangeLog.Oct2012 b/sql/ChangeLog.Oct2012 --- a/sql/ChangeLog.Oct2012 +++ b/sql/ChangeLog.Oct2012 @@ -1,7 +1,3 @@ # ChangeLog file for sql # This file is updated with Maddlog -* Wed Nov 21 2012 Fabian Groffen <[email protected]> -- Fixed crash when performing an INSERT on a table with string-like column - defaulting to NULL and omitting that column from VALUES, bug #3168 - _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
