Changeset: 0ffb8bdefa05 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ffb8bdefa05 Modified Files: Branch: default Log Message:
merging diffs (truncated from 854 to 300 lines): diff -r 40e5ea1dda58 -r 0ffb8bdefa05 .hgtags --- a/.hgtags Wed Dec 15 13:35:40 2010 +0100 +++ b/.hgtags Wed Dec 15 13:36:09 2010 +0100 @@ -432,3 +432,4 @@ 49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1 49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1 491925a23d21d3599a5680618f4f00f8b8710c78 Oct2010_1 +be8749b7640878f829575ef9daa995810d6fe25d Oct2010_3 diff -r 40e5ea1dda58 -r 0ffb8bdefa05 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Wed Dec 15 13:35:40 2010 +0100 +++ b/MonetDB/MonetDB.spec Wed Dec 15 13:36:09 2010 +0100 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Oct2010/%{name}-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Oct2010-SP1/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: zlib-devel, bzip2-devel, openssl-devel @@ -109,6 +109,9 @@ %{_libdir}/libbat.so %changelog +* Wed Dec 15 2010 Sjoerd Mullender <[email protected]> - 1.40.3-20101215 +- Rebuilt. + * Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101110 - Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 MonetDB/debian/changelog --- a/MonetDB/debian/changelog Wed Dec 15 13:35:40 2010 +0100 +++ b/MonetDB/debian/changelog Wed Dec 15 13:36:09 2010 +0100 @@ -1,3 +1,9 @@ +monetdb (1.40.3-20101215) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Wed, 15 Dec 2010 09:39:10 +0100 + monetdb (1.40.1-20101110) unstable; urgency=low * Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Wed Dec 15 13:35:40 2010 +0100 +++ b/MonetDB4/MonetDB-server.spec Wed Dec 15 13:36:09 2010 +0100 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Oct2010/MonetDB4-server-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Oct2010-SP1/MonetDB4-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(pre): shadow-utils @@ -216,6 +216,9 @@ %{_libdir}/libembeddedmil.so %changelog +* Wed Dec 15 2010 Sjoerd Mullender <[email protected]> - 4.40.3-20101215 +- Rebuilt. + * Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 4.40.1-20101110 - Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 MonetDB4/debian/changelog --- a/MonetDB4/debian/changelog Wed Dec 15 13:35:40 2010 +0100 +++ b/MonetDB4/debian/changelog Wed Dec 15 13:36:09 2010 +0100 @@ -1,3 +1,9 @@ +monetdb4-server (4.40.3-20101215) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Wed, 15 Dec 2010 09:39:10 +0100 + monetdb4-server (4.40.1-20101110) unstable; urgency=low * Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Wed Dec 15 13:35:40 2010 +0100 +++ b/MonetDB5/MonetDB-server.spec Wed Dec 15 13:36:09 2010 +0100 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Oct2010/MonetDB5-server-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Oct2010-SP1/MonetDB5-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(pre): shadow-utils @@ -205,6 +205,9 @@ %{_libdir}/pkgconfig/monetdb-mal.pc %changelog +* Wed Dec 15 2010 Sjoerd Mullender <[email protected]> - 5.22.3-20101215 +- Rebuilt. + * Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 5.22.1-20101110 - Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Wed Dec 15 13:35:40 2010 +0100 +++ b/MonetDB5/debian/changelog Wed Dec 15 13:36:09 2010 +0100 @@ -1,3 +1,9 @@ +monetdb5-server (5.22.3-20101215) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Wed, 15 Dec 2010 09:39:10 +0100 + monetdb5-server (5.22.1-20101110) unstable; urgency=low * Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 buildtools/conf/MonetDB.m4 --- a/buildtools/conf/MonetDB.m4 Wed Dec 15 13:35:40 2010 +0100 +++ b/buildtools/conf/MonetDB.m4 Wed Dec 15 13:36:09 2010 +0100 @@ -2024,7 +2024,8 @@ *aix*-) CFLAGS="$CFLAGS -O3" NO_INLINE_CFLAGS="$NO_INLINE_CFLAGS -qnooptimize" ;; - *-*-*-) ;; + *-*-*-) CFLAGS="$CFLAGS -O2" + ;; dnl With icc-8.*, Interprocedural (IP) Optimization does not seem to work with MonetDB: dnl With "-ipo -ipo_obj", pass-through linker options ("-Wl,...") are not handled correctly, @@ -2043,7 +2044,7 @@ # x86_64-*-*-10.*) CFLAGS="$CFLAGS -unroll ";; # x86_64-*-*-10.*) CFLAGS="$CFLAGS -axWPT ";; - x86_64-*-*-11.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -axWPT -axSSE4.2 ";; + x86_64-*-*-11.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -axSSE4.2 ";; i*86-*-*-8.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp6 -axKWNPB";; i*86-*-*-9.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp6 -axKWNPB";; diff -r 40e5ea1dda58 -r 0ffb8bdefa05 clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive Wed Dec 15 13:35:40 2010 +0100 +++ b/clients/ChangeLog-Archive Wed Dec 15 13:36:09 2010 +0100 @@ -1,6 +1,13 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Nov 19 2010 Fabian Groffen <[email protected]> - 1.40.3-20101215 +- Workaround usage of strncat to solve mclient/mapilib aborts from + bug #2725 + +* Fri Nov 12 2010 Sjoerd Mullender <[email protected]> - 1.40.3-20101215 +- Fixed a corner case in the table display code. + * Thu Oct 28 2010 Fabian Groffen <[email protected]> - 1.40.1-20101029 - Fix crash when the server disconnects during \d query diff -r 40e5ea1dda58 -r 0ffb8bdefa05 clients/ChangeLog.Oct2010 --- a/clients/ChangeLog.Oct2010 Wed Dec 15 13:35:40 2010 +0100 +++ b/clients/ChangeLog.Oct2010 Wed Dec 15 13:36:09 2010 +0100 @@ -1,10 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Fri Nov 19 2010 Fabian Groffen <[email protected]> -- Workaround usage of strncat to solve mclient/mapilib aborts from - bug #2725 - -* Fri Nov 12 2010 Sjoerd Mullender <[email protected]> -- Fixed a corner case in the table display code. - diff -r 40e5ea1dda58 -r 0ffb8bdefa05 clients/MonetDB-client.spec --- a/clients/MonetDB-client.spec Wed Dec 15 13:35:40 2010 +0100 +++ b/clients/MonetDB-client.spec Wed Dec 15 13:36:09 2010 +0100 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Oct2010/MonetDB-client-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Oct2010-SP1/MonetDB-client-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: MonetDB >= 1.40 @@ -303,6 +303,16 @@ %{_libdir}/MonetDB/Tests/* %changelog +* Wed Dec 15 2010 Sjoerd Mullender <[email protected]> - 1.40.3-20101215 +- Rebuilt. + +* Fri Nov 19 2010 Fabian Groffen <[email protected]> - 1.40.3-20101215 +- Workaround usage of strncat to solve mclient/mapilib aborts from + bug #2725 + +* Fri Nov 12 2010 Sjoerd Mullender <[email protected]> - 1.40.3-20101215 +- Fixed a corner case in the table display code. + * Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101110 - Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 clients/debian/changelog --- a/clients/debian/changelog Wed Dec 15 13:35:40 2010 +0100 +++ b/clients/debian/changelog Wed Dec 15 13:36:09 2010 +0100 @@ -1,3 +1,22 @@ +monetdb-client (1.40.3-20101215) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Wed, 15 Dec 2010 09:39:11 +0100 + +monetdb-client (1.40.3-20101215) unstable; urgency=low + + * Workaround usage of strncat to solve mclient/mapilib aborts from + bug #2725 + + -- Fabian Groffen <[email protected]> Fri, 19 Nov 2010 09:39:10 +0100 + +monetdb-client (1.40.3-20101215) unstable; urgency=low + + * Fixed a corner case in the table display code. + + -- Sjoerd Mullender <[email protected]> Fri, 12 Nov 2010 09:39:10 +0100 + monetdb-client (1.40.1-20101110) unstable; urgency=low * Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 geom/MonetDB-geom.spec --- a/geom/MonetDB-geom.spec Wed Dec 15 13:35:40 2010 +0100 +++ b/geom/MonetDB-geom.spec Wed Dec 15 13:36:09 2010 +0100 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Oct2010/MonetDB-geom-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Oct2010-SP1/MonetDB-geom-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %{!?_with_monetdb4: %{!?_without_monetdb4: %define _without_monetdb4 --without-monetdb4}} @@ -172,6 +172,9 @@ %endif %changelog +* Wed Dec 15 2010 Sjoerd Mullender <[email protected]> - 0.20.3-20101215 +- Rebuilt. + * Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 0.20.1-20101110 - Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 geom/debian/changelog --- a/geom/debian/changelog Wed Dec 15 13:35:40 2010 +0100 +++ b/geom/debian/changelog Wed Dec 15 13:36:09 2010 +0100 @@ -1,3 +1,9 @@ +monetdb-geom (0.20.3-20101215) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Wed, 15 Dec 2010 09:39:11 +0100 + monetdb-geom (0.20.1-20101110) unstable; urgency=low * Rebuilt. diff -r 40e5ea1dda58 -r 0ffb8bdefa05 java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java --- a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java Wed Dec 15 13:35:40 2010 +0100 +++ b/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java Wed Dec 15 13:36:09 2010 +0100 @@ -62,6 +62,8 @@ private final String[] values; private final StringBuffer buf; + + private final MonetConnection connection; /* only parse the date patterns once, use multiple times */ /** Format of a timestamp with RFC822 time zone */ @@ -117,6 +119,8 @@ values = new String[size]; buf = new StringBuffer(6 + 12 * size); + this.connection = connection; + // fill the arrays ResultSet rs = super.getResultSet(); for (int i = 0; rs.next(); i++) { @@ -159,6 +163,8 @@ buf = null; id = -1; size = -1; + + this.connection = connection; } //== methods interface PreparedStatement @@ -1322,6 +1328,38 @@ throw new SQLException("Operation currently not supported!"); } + /** + * Releases this PreparedStatement object's database and JDBC + * resources immediately instead of waiting for this to happen when + * it is automatically closed. It is generally good practice to + * release resources as soon as you are finished with them to avoid + * tying up database resources. + * <br /><br /> + * Calling the method close on a PreparedStatement object that is + * already closed has no effect. + * <br /><br /> _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
