Changeset: e2a25f961197 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2a25f961197
Modified Files:
        .hgtags
        MonetDB.spec
        debian/changelog
        java/Makefile.ag
        java/build.properties
        java/pom.xml
        java/release.txt
        libversions
Branch: default
Log Message:

Merge with Jul2015 branch.


diffs (186 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -613,3 +613,5 @@ d1dd6e5b7a5acfe14a33070e08c776341996deb2
 2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_11
 d1dd6e5b7a5acfe14a33070e08c776341996deb2 Jul2015_SP1_release
 2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_SP1_release
+25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_13
+25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -91,7 +91,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/Jul2015-SP1/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jul2015-SP2/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -970,6 +970,45 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Jan 05 2016 Sjoerd Mullender <[email protected]> - 11.21.13-20160105
+- Rebuilt.
+- BZ#2014: 'null' from copy into gets wrong
+- BZ#3817: opt_pushselect stuck with multi-table UDF
+- BZ#3835: windows does not release ram after operations
+- BZ#3836: rand() only gets evaluated once when used as an expression
+- BZ#3838: Update column with or without parenthesis produce different
+  results
+- BZ#3840: savepoints may crash the database
+- BZ#3841: mclient fails with response "Challenge string is not valid"
+- BZ#3842: SQL execution fails to finish and reports bogus error messages
+- BZ#3845: Too many VALUES in INSERT freeze mserver5
+- BZ#3847: Wrong SQL results for a certain combination of GROUP BY /
+  ORDER BY / LIMIT
+- BZ#3848: mserver segfault during bulk loading/updating
+- BZ#3849: HUGEINT incorrect value
+- BZ#3850: DEL character not escaped
+- BZ#3851: expression that should evaluate to FALSE evaluates to TRUE
+  in SELECT query
+- BZ#3852: CASE statement produces GDK error on multithreaded database:
+  BATproject does not match always
+- BZ#3854: Complex expression with comparison evaluates incorrectly in
+  WHERE clause
+- BZ#3855: Foreign key referencing table in a different schema -
+  not allowed.
+- BZ#3857: Large LIMIT in SELECT may abort the query
+- BZ#3861: Using window functions cause a crash
+- BZ#3864: Error in bulk import for chinese character
+- BZ#3871: NOT x LIKE triggers "too many nested operators"
+- BZ#3872: mserver crashes under specific combination of JOIN and WHERE
+  conditions
+- BZ#3873: mserver5: gdk_bat.c:1015: setcolprops: Assertion `x !=
+  ((void *)0) || col->type == 0' failed.
+- BZ#3879: Database crashes when querying with several UNION ALLs.
+- BZ#3887: Querying "sys"."tracelog" causes assertion violation and
+  crash of mserver5 process
+- BZ#3889: read only does not protect empty tables
+- BZ#3895: read only does not protect this table
+
 * Fri Oct 30 2015 Sjoerd Mullender <[email protected]> - 11.21.11-20151030
 - Rebuilt.
 - BZ#3828: Schema corruption after several ALTER TABLE statements and
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+monetdb (11.21.13) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#2014: 'null' from copy into gets wrong
+  * BZ#3817: opt_pushselect stuck with multi-table UDF
+  * BZ#3835: windows does not release ram after operations
+  * BZ#3836: rand() only gets evaluated once when used as an expression
+  * BZ#3838: Update column with or without parenthesis produce different
+    results
+  * BZ#3840: savepoints may crash the database
+  * BZ#3841: mclient fails with response "Challenge string is not valid"
+  * BZ#3842: SQL execution fails to finish and reports bogus error messages
+  * BZ#3845: Too many VALUES in INSERT freeze mserver5
+  * BZ#3847: Wrong SQL results for a certain combination of GROUP BY /
+    ORDER BY / LIMIT
+  * BZ#3848: mserver segfault during bulk loading/updating
+  * BZ#3849: HUGEINT incorrect value
+  * BZ#3850: DEL character not escaped
+  * BZ#3851: expression that should evaluate to FALSE evaluates to TRUE
+    in SELECT query
+  * BZ#3852: CASE statement produces GDK error on multithreaded database:
+    BATproject does not match always
+  * BZ#3854: Complex expression with comparison evaluates incorrectly in
+    WHERE clause
+  * BZ#3855: Foreign key referencing table in a different schema -
+    not allowed.
+  * BZ#3857: Large LIMIT in SELECT may abort the query
+  * BZ#3861: Using window functions cause a crash
+  * BZ#3864: Error in bulk import for chinese character
+  * BZ#3871: NOT x LIKE triggers "too many nested operators"
+  * BZ#3872: mserver crashes under specific combination of JOIN and WHERE
+    conditions
+  * BZ#3873: mserver5: gdk_bat.c:1015: setcolprops: Assertion `x !=
+    ((void *)0) || col->type == 0' failed.
+  * BZ#3879: Database crashes when querying with several UNION ALLs.
+  * BZ#3887: Querying "sys"."tracelog" causes assertion violation and
+    crash of mserver5 process
+  * BZ#3889: read only does not protect empty tables
+  * BZ#3895: read only does not protect this table
+
+ -- Sjoerd Mullender <[email protected]>  Tue, 05 Jan 2016 11:05:59 +0100
+
 monetdb (11.21.11) unstable; urgency=low
 
   * Rebuilt.
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.18.jar jdbcclient.jar
+       FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.19.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=18
+JDBC_MINOR=19
 # 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>
        <artifactId>monetdb-jdbc</artifactId>
-       <version>2.18</version>
+       <version>2.19</version>
        <name>${project.groupId}:${project.artifactId}</name>
        <description>MonetDB JDBC driver</description>
        <url>https://www.monetdb.org</url>
diff --git a/java/release.txt b/java/release.txt
--- a/java/release.txt
+++ b/java/release.txt
@@ -1,8 +1,8 @@
 RELEASE NOTES
-MonetDB JDBC driver version 2.18 (Liberica/MCL-1.13)
+MonetDB JDBC driver version 2.19 (Liberica/MCL-1.13)
 Fabian Groffen <[email protected]>
 
-Release date: 2015-10-20
+Release date: 2016-01-05
 
 
 This JDBC driver is designed for use with MonetDB, a main-memory
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=12:5:0
+GDK_VERSION=12:6:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=7:5:0
+MAPI_VERSION=7:6:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=20:0:1
+MONETDB5_VERSION=20:1:1
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=7:0:0
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to