Changeset: cd5b2d90fd4f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd5b2d90fd4f
Modified Files:
.hgtags
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/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/libbat.rc
java/ChangeLog-Archive
java/ChangeLog.Jun2016
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
libversions
monetdb5/optimizer/opt_mergetable.c
monetdb5/tools/libmonetdb5.rc
sql/server/rel_optimizer.c
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/bugs/Tests/select_select_bug.stable.out
sql/test/mergetables/Tests/part-elim.stable.out
vertoo.data
Branch: jit
Log Message:
merged with default
diffs (truncated from 523 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -629,3 +629,6 @@ 192e3168234a5f9f8a4d1c4ce17805f608f001c3
b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_release
4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_5
4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_SP1_release
+c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_7
+4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_SP1_release
+c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -962,6 +962,44 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Wed Jul 13 2016 Sjoerd Mullender <[email protected]> - 11.23.7-20160713
+- Rebuilt.
+- BZ#4014: KILL signal
+- BZ#4021: Analyze query does not escape input [security]
+- BZ#4026: JDBC driver incorrectly converts TINYINT fields to String
+ instead of an integer type.
+- BZ#4028: inputs not the same size
+- BZ#4032: no decimal places after update. ODBC driver
+- BZ#4035: SQL Function call bug
+- BZ#4036: Possible sql_catalog corruption due to unclean backuped tail
+
+* Thu Jul 7 2016 Martin van Dinther <[email protected]>
- 11.23.7-20160713
+- java: Corrected PROCEDURE_TYPE output value of method
DatabaseMetaData.getProcedures().
+ It used to return procedureReturnsResult. Now it returns procedureNoResult.
+ Corrected ORDINAL_POSITION output value of method
DatabaseMetaData.getProcedureColumns().
+ It used to start with 0, but as procedures do not return a result value it
now
+ starts with 1 for all the procedure arguments, as defined by the JDBC API.
+- java: Improved output of method DatabaseMetaData.getProcedures(). The REMARKS
+ column now contains the procedure definition as stored in sys.functions.func.
+ The SPECIFIC_NAME column now contains the procedure unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the specific
+ overloaded procedure which has the same name, but different arguments.
+ Also improved output of method DatabaseMetaData.getProcedureColumns().
+ The SPECIFIC_NAME column now contains the procedure unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the proper
+ arguments of the specific overloaded procedure by matching the SPECIFIC_NAME
+ value.
+- java: Improved output of method DatabaseMetaData.getFunctions(). The REMARKS
+ column now contains the function definition as stored in sys.functions.func.
+ The SPECIFIC_NAME column now contains the function unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the specific
+ overloaded function which has the same name, but different arguments.
+ Also improved output of method DatabaseMetaData.getFunctionColumns().
+ The SPECIFIC_NAME column now contains the function unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the proper
+ arguments of the specific overloaded function by matching the SPECIFIC_NAME
+ value.
+
* Mon Jul 04 2016 Sjoerd Mullender <[email protected]> - 11.23.5-20160704
- Rebuilt.
- BZ#4031: mclient doesn't accept - argument to refer to stdin
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -23926,34 +23926,18 @@ command bat.mirror(b:bat[:any_2]):bat[:o
address BKCmirror;
comment Returns the head-mirror image of a BAT (two head columns).
-pattern bat.new_persistent(ht:oid,tt:any_1,size:lng):bat[:any_1]
-address CMDBATnew_persistent;
-comment Creates a new BAT in the persistent farm and allocate space.
-
-pattern bat.new_persistent(ht:oid,tt:any_1,size:int):bat[:any_1]
-address CMDBATnew_persistent;
-pattern bat.new_persistent(ht:oid,tt:any_1):bat[:any_1]
-address CMDBATnew_persistent;
-comment Creates a new empty transient BAT in the persistent farm, with head-
and tail-types as indicated.
-
-pattern bat.new(ht:oid,tt:any_1,size:lng):bat[:any_1]
+pattern bat.new(tt:any_1,size:lng):bat[:any_1]
address CMDBATnew;
-comment Creates a new BAT with sufficient space.
-
-pattern bat.new(ht:oid,tt:any_1,size:int):bat[:any_1]
+comment Creates a new empty transient BAT, with tail-types as indicated.
+
+pattern bat.new(tt:any_1,size:int,persist:bit):bat[:any_1]
address CMDBATnew;
-pattern bat.new(ht:oid,tt:any_1):bat[:any_1]
+pattern bat.new(tt:any_1,size:lng,persist:bit):bat[:any_1]
address CMDBATnew;
-comment Creates a new empty transient BAT, with head- and tail-types as
indicated.
-
-pattern bat.new(tt:any_1,size:lng):bat[:any_1]
-address CMDBATnewColumn;
-comment Creates a new empty transient BAT, with tail-types as indicated.
-
pattern bat.new(tt:any_1,size:int):bat[:any_1]
-address CMDBATnewColumn;
+address CMDBATnew;
pattern bat.new(tt:any_1):bat[:any_1]
-address CMDBATnewColumn;
+address CMDBATnew;
pattern bat.orderidx(bv:bat[:any_1],l:bat[:any_1]...):void
address OIDXmerge;
comment Consolidates the OID index arrangement
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -31785,34 +31785,18 @@ command bat.mirror(b:bat[:any_2]):bat[:o
address BKCmirror;
comment Returns the head-mirror image of a BAT (two head columns).
-pattern bat.new_persistent(ht:oid,tt:any_1,size:lng):bat[:any_1]
-address CMDBATnew_persistent;
-comment Creates a new BAT in the persistent farm and allocate space.
-
-pattern bat.new_persistent(ht:oid,tt:any_1,size:int):bat[:any_1]
-address CMDBATnew_persistent;
-pattern bat.new_persistent(ht:oid,tt:any_1):bat[:any_1]
-address CMDBATnew_persistent;
-comment Creates a new empty transient BAT in the persistent farm, with head-
and tail-types as indicated.
-
-pattern bat.new(ht:oid,tt:any_1,size:lng):bat[:any_1]
+pattern bat.new(tt:any_1,size:lng):bat[:any_1]
address CMDBATnew;
-comment Creates a new BAT with sufficient space.
-
-pattern bat.new(ht:oid,tt:any_1,size:int):bat[:any_1]
+comment Creates a new empty transient BAT, with tail-types as indicated.
+
+pattern bat.new(tt:any_1,size:int,persist:bit):bat[:any_1]
address CMDBATnew;
-pattern bat.new(ht:oid,tt:any_1):bat[:any_1]
+pattern bat.new(tt:any_1,size:lng,persist:bit):bat[:any_1]
address CMDBATnew;
-comment Creates a new empty transient BAT, with head- and tail-types as
indicated.
-
-pattern bat.new(tt:any_1,size:lng):bat[:any_1]
-address CMDBATnewColumn;
-comment Creates a new empty transient BAT, with tail-types as indicated.
-
pattern bat.new(tt:any_1,size:int):bat[:any_1]
-address CMDBATnewColumn;
+address CMDBATnew;
pattern bat.new(tt:any_1):bat[:any_1]
-address CMDBATnewColumn;
+address CMDBATnew;
pattern bat.orderidx(bv:bat[:any_1],l:bat[:any_1]...):void
address OIDXmerge;
comment Consolidates the OID index arrangement
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+monetdb (11.23.7) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#4014: KILL signal
+ * BZ#4021: Analyze query does not escape input [security]
+ * BZ#4026: JDBC driver incorrectly converts TINYINT fields to String
+ instead of an integer type.
+ * BZ#4028: inputs not the same size
+ * BZ#4032: no decimal places after update. ODBC driver
+ * BZ#4035: SQL Function call bug
+ * BZ#4036: Possible sql_catalog corruption due to unclean backuped tail
+
+ -- Sjoerd Mullender <[email protected]> Wed, 13 Jul 2016 14:33:03 +0200
+
+monetdb (11.23.7) unstable; urgency=low
+
+ * java: Corrected PROCEDURE_TYPE output value of method
DatabaseMetaData.getProcedures().
+ It used to return procedureReturnsResult. Now it returns procedureNoResult.
+ Corrected ORDINAL_POSITION output value of method
DatabaseMetaData.getProcedureColumns().
+ It used to start with 0, but as procedures do not return a result value it
now
+ starts with 1 for all the procedure arguments, as defined by the JDBC API.
+ * java: Improved output of method DatabaseMetaData.getProcedures(). The
REMARKS
+ column now contains the procedure definition as stored in
sys.functions.func.
+ The SPECIFIC_NAME column now contains the procedure unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the specific
+ overloaded procedure which has the same name, but different arguments.
+ Also improved output of method DatabaseMetaData.getProcedureColumns().
+ The SPECIFIC_NAME column now contains the procedure unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the proper
+ arguments of the specific overloaded procedure by matching the
SPECIFIC_NAME
+ value.
+ * java: Improved output of method DatabaseMetaData.getFunctions(). The
REMARKS
+ column now contains the function definition as stored in
sys.functions.func.
+ The SPECIFIC_NAME column now contains the function unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the specific
+ overloaded function which has the same name, but different arguments.
+ Also improved output of method DatabaseMetaData.getFunctionColumns().
+ The SPECIFIC_NAME column now contains the function unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the proper
+ arguments of the specific overloaded function by matching the SPECIFIC_NAME
+ value.
+
+ -- Martin van Dinther <[email protected]> Thu, 7 Jul
2016 14:33:03 +0200
+
monetdb (11.23.5) 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,33 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Jul 7 2016 Martin van Dinther <[email protected]>
- 11.23.7-20160713
+- Corrected PROCEDURE_TYPE output value of method
DatabaseMetaData.getProcedures().
+ It used to return procedureReturnsResult. Now it returns procedureNoResult.
+ Corrected ORDINAL_POSITION output value of method
DatabaseMetaData.getProcedureColumns().
+ It used to start with 0, but as procedures do not return a result value it
now
+ starts with 1 for all the procedure arguments, as defined by the JDBC API.
+- Improved output of method DatabaseMetaData.getProcedures(). The REMARKS
+ column now contains the procedure definition as stored in sys.functions.func.
+ The SPECIFIC_NAME column now contains the procedure unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the specific
+ overloaded procedure which has the same name, but different arguments.
+ Also improved output of method DatabaseMetaData.getProcedureColumns().
+ The SPECIFIC_NAME column now contains the procedure unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the proper
+ arguments of the specific overloaded procedure by matching the SPECIFIC_NAME
+ value.
+- Improved output of method DatabaseMetaData.getFunctions(). The REMARKS
+ column now contains the function definition as stored in sys.functions.func.
+ The SPECIFIC_NAME column now contains the function unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the specific
+ overloaded function which has the same name, but different arguments.
+ Also improved output of method DatabaseMetaData.getFunctionColumns().
+ The SPECIFIC_NAME column now contains the function unique identifier as
+ stored in sys.functions.id. This allows the caller to retrieve the proper
+ arguments of the specific overloaded function by matching the SPECIFIC_NAME
+ value.
+
* Thu May 26 2016 Martin van Dinther <[email protected]>
- 11.23.1-20160601
- Fixed problem in DatabaseMetaData.getUDTs() when it was called with
types parameter filled. It used to throw SQException with message:
diff --git a/java/ChangeLog.Jun2016 b/java/ChangeLog.Jun2016
--- a/java/ChangeLog.Jun2016
+++ b/java/ChangeLog.Jun2016
@@ -1,30 +1,3 @@
# ChangeLog file for java
# This file is updated with Maddlog
-* Thu Jul 7 2016 Martin van Dinther <[email protected]>
-- Corrected PROCEDURE_TYPE output value of method
DatabaseMetaData.getProcedures().
- It used to return procedureReturnsResult. Now it returns procedureNoResult.
- Corrected ORDINAL_POSITION output value of method
DatabaseMetaData.getProcedureColumns().
- It used to start with 0, but as procedures do not return a result value it
now
- starts with 1 for all the procedure arguments, as defined by the JDBC API.
-- Improved output of method DatabaseMetaData.getProcedures(). The REMARKS
- column now contains the procedure definition as stored in sys.functions.func.
- The SPECIFIC_NAME column now contains the procedure unique identifier as
- stored in sys.functions.id. This allows the caller to retrieve the specific
- overloaded procedure which has the same name, but different arguments.
- Also improved output of method DatabaseMetaData.getProcedureColumns().
- The SPECIFIC_NAME column now contains the procedure unique identifier as
- stored in sys.functions.id. This allows the caller to retrieve the proper
- arguments of the specific overloaded procedure by matching the SPECIFIC_NAME
- value.
-- Improved output of method DatabaseMetaData.getFunctions(). The REMARKS
- column now contains the function definition as stored in sys.functions.func.
- The SPECIFIC_NAME column now contains the function unique identifier as
- stored in sys.functions.id. This allows the caller to retrieve the specific
- overloaded function which has the same name, but different arguments.
- Also improved output of method DatabaseMetaData.getFunctionColumns().
- The SPECIFIC_NAME column now contains the function unique identifier as
- stored in sys.functions.id. This allows the caller to retrieve the proper
- arguments of the specific overloaded function by matching the SPECIFIC_NAME
- value.
-
diff --git a/java/Makefile.ag b/java/Makefile.ag
--- a/java/Makefile.ag
+++ b/java/Makefile.ag
@@ -16,7 +16,7 @@ JAVA_HOME = @JAVA_HOME@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/monetdb/lib
- FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.22.jar jdbcclient.jar
+ FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.23.jar jdbcclient.jar
}
ant_distmerocontrol = {
diff --git a/java/build.properties b/java/build.properties
--- a/java/build.properties
+++ b/java/build.properties
@@ -19,7 +19,7 @@ MCL_MINOR=13
# major release number
JDBC_MAJOR=2
# minor release number
-JDBC_MINOR=22
+JDBC_MINOR=23
# an additional identifying string
JDBC_VER_SUFFIX=Liberica
# the default port to connect on, if no port given when using SQL
diff --git a/java/pom.xml b/java/pom.xml
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -6,7 +6,7 @@
<groupId>monetdb</groupId>
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
