Changeset: ee407bf25d9c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee407bf25d9c
Modified Files:
Branch: default
Log Message:
merged from Oct2010
diffs (100 lines):
diff -r fb2d20663f7d -r ee407bf25d9c clients/src/mapiclient/mclient.c
--- a/clients/src/mapiclient/mclient.c Thu Oct 21 13:23:44 2010 +0200
+++ b/clients/src/mapiclient/mclient.c Fri Oct 22 15:00:13 2010 +0200
@@ -1657,7 +1657,8 @@
protocol) we break out of the loop (via the
continue). The assertion at the end will then go
off. */
- if (mapi_query_done(hdl) == MMORE && (length > 0 ||
mapi_query_done(hdl) == MMORE))
+ if (mapi_query_done(hdl) == MMORE &&
+ (length > 0 || mapi_query_done(hdl) == MMORE))
continue; /* get more data */
CHECK_RESULT(mid, hdl, buf + skip, continue);
diff -r fb2d20663f7d -r ee407bf25d9c java/ChangeLog.Oct2010
--- a/java/ChangeLog.Oct2010 Thu Oct 21 13:23:44 2010 +0200
+++ b/java/ChangeLog.Oct2010 Fri Oct 22 15:00:13 2010 +0200
@@ -1,3 +1,7 @@
# ChangeLog file for java
# This file is updated with mchangelog (Gentoo echangelog bastard script)
+* Fri Oct 22 2010 Fabian Groffen <[email protected]>
+- Fix for bug #2703, allow to have multiple metadata ResultSets open at
+ the same time
+
diff -r fb2d20663f7d -r ee407bf25d9c java/Makefile.ag
--- a/java/Makefile.ag Thu Oct 21 13:23:44 2010 +0200
+++ b/java/Makefile.ag Fri Oct 22 15:00:13 2010 +0200
@@ -30,7 +30,7 @@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.6-mcl.jar monetdb-1.16-jdbc.jar jdbcclient.jar
+ FILES = monetdb-1.6-mcl.jar monetdb-1.17-jdbc.jar jdbcclient.jar
}
ant_distxrpc = {
diff -r fb2d20663f7d -r ee407bf25d9c java/NT/rules.msc
--- a/java/NT/rules.msc Thu Oct 21 13:23:44 2010 +0200
+++ b/java/NT/rules.msc Fri Oct 22 15:00:13 2010 +0200
@@ -28,6 +28,6 @@
!INCLUDE $(RULESMSC)
pkg = java
-VERSION=20100720
+VERSION=20101022
ODBC_LIBS = odbccp32.lib user32.lib
diff -r fb2d20663f7d -r ee407bf25d9c java/build.properties
--- a/java/build.properties Thu Oct 21 13:23:44 2010 +0200
+++ b/java/build.properties Fri Oct 22 15:00:13 2010 +0200
@@ -19,7 +19,7 @@
# major release number
JDBC_MAJOR=1
# minor release number
-JDBC_MINOR=16
+JDBC_MINOR=17
# an additional identifying string
JDBC_VER_SUFFIX=Magnistipula
# the default port to connect on, if no port given when using SQL
diff -r fb2d20663f7d -r ee407bf25d9c java/release.txt
--- a/java/release.txt Thu Oct 21 13:23:44 2010 +0200
+++ b/java/release.txt Fri Oct 22 15:00:13 2010 +0200
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 1.16 (Magnistipula/MCL-1.6)
+MonetDB JDBC driver version 1.17 (Magnistipula/MCL-1.6)
Fabian Groffen <[email protected]>
-Release date: 2010-07-20
+Release date: 2010-10-22
This JDBC driver is designed for use with MonetDB, a main-memory
diff -r fb2d20663f7d -r ee407bf25d9c
java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java Thu Oct 21
13:23:44 2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java Fri Oct 22
15:00:13 2010 +0200
@@ -32,7 +32,6 @@
public class MonetDatabaseMetaData implements DatabaseMetaData {
private Connection con;
private Driver driver;
- private Statement stmt;
private static Map envs = new HashMap();
public MonetDatabaseMetaData(Connection parent) {
@@ -42,10 +41,11 @@
private synchronized Statement getStmt() throws SQLException {
// use Statement which allows scrolling both directions through
results
- if (stmt == null)
- stmt =
con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
-
- return(stmt);
+ // cannot reuse stmt here, as people may request multiple
+ // queries, see for example bug #2703
+ return(con.createStatement(
+ ResultSet.TYPE_SCROLL_INSENSITIVE,
+ ResultSet.CONCUR_READ_ONLY));
}
/**
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
