Changeset: fa6199240d8a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa6199240d8a
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (71 lines):
diff -r 0aecddfa8e81 -r fa6199240d8a java/ChangeLog.Jun2010
--- a/java/ChangeLog.Jun2010 Fri Jul 16 14:24:20 2010 +0200
+++ b/java/ChangeLog.Jun2010 Fri Jul 16 14:50:13 2010 +0200
@@ -23,3 +23,6 @@
latter clean from files generated during the build.
On Windows, the build directory must be a sibling of ...<package>NT .
+* Fri Jul 16 2010 Fabian Groffen <fab...@cwi.nl>
+- Fix problem when using the MAL language. Any statement would return an
error with a typo that was not typed in by the user, such as ioo.printf when
io.printf was typed.
+
diff -r 0aecddfa8e81 -r fa6199240d8a java/Makefile.ag
--- a/java/Makefile.ag Fri Jul 16 14:24:20 2010 +0200
+++ b/java/Makefile.ag Fri Jul 16 14:50:13 2010 +0200
@@ -30,7 +30,7 @@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.6-mcl.jar monetdb-1.15-jdbc.jar jdbcclient.jar
+ FILES = monetdb-1.6-mcl.jar monetdb-1.16-jdbc.jar jdbcclient.jar
}
ant_distxrpc = {
diff -r 0aecddfa8e81 -r fa6199240d8a java/NT/rules.msc
--- a/java/NT/rules.msc Fri Jul 16 14:24:20 2010 +0200
+++ b/java/NT/rules.msc Fri Jul 16 14:50:13 2010 +0200
@@ -28,6 +28,6 @@
!INCLUDE $(RULESMSC)
pkg = java
-VERSION=20100331
+VERSION=20100716
ODBC_LIBS = odbccp32.lib user32.lib
diff -r 0aecddfa8e81 -r fa6199240d8a java/build.properties
--- a/java/build.properties Fri Jul 16 14:24:20 2010 +0200
+++ b/java/build.properties Fri Jul 16 14:50:13 2010 +0200
@@ -19,7 +19,7 @@
# major release number
JDBC_MAJOR=1
# minor release number
-JDBC_MINOR=15
+JDBC_MINOR=16
# an additional identifying string
JDBC_VER_SUFFIX=Magnistipula
# the default port to connect on, if no port given when using SQL
diff -r 0aecddfa8e81 -r fa6199240d8a java/release.txt
--- a/java/release.txt Fri Jul 16 14:24:20 2010 +0200
+++ b/java/release.txt Fri Jul 16 14:50:13 2010 +0200
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 1.15 (Magnistipula/MCL-1.6)
+MonetDB JDBC driver version 1.16 (Magnistipula/MCL-1.6)
Fabian Groffen <fabian.grof...@cwi.nl>
-Release date: 2010-03-31
+Release date: 2010-07-16
This JDBC driver is designed for use with MonetDB, a main-memory
diff -r 0aecddfa8e81 -r fa6199240d8a
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java Fri Jul 16 14:24:20
2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java Fri Jul 16 14:50:13
2010 +0200
@@ -254,7 +254,7 @@
commandTempl[2] = "\nX"; // separator
} else if (lang == LANG_MIL || lang == LANG_MAL) {
queryTempl[0] = null;
- queryTempl[1] = ";";
+ queryTempl[1] = ";\n";
queryTempl[2] = ";\n";
commandTempl[0] = null; // pre
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
