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

Merge with Jul2015 branch.


diffs (216 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -605,3 +605,5 @@ 30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d
 c7c0a76e663e34bcddae683b385c8e5a919ffd84 Jul2015_5
 30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_release
 c7c0a76e663e34bcddae683b385c8e5a919ffd84 Jul2015_release
+d1bce2fabbc36a3a3b996b09e55e764a626026a8 Jul2015_7
+d1bce2fabbc36a3a3b996b09e55e764a626026a8 Jul2015_SP1_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/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jul2015-SP1/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -996,6 +996,42 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Oct 20 2015 Sjoerd Mullender <[email protected]> - 11.21.7-20151020
+- Rebuilt.
+- BZ#3789: Query on large string table fails on HEAPextend
+- BZ#3794: table function sys.rejects() and view sys.rejects() are listed
+  are metadata objects but give an (incorrect) error when they are queried
+- BZ#3797: COPY INTO with incorrect number columns
+- BZ#3798: SELECT query with INTERSECT causes assertion failure
+- BZ#3800: LIKE is broken for many patterns
+- BZ#3802: Disk space never freed: a logical ref is keeped on a deleted
+  BATs
+- BZ#3803: SQL query parser fails to parse valid SELECT query with a
+  CASE .. END in it. It fails with parser error: identifier 'x' ambiguous
+- BZ#3804: `monetdb status` command crashes under certain conditions
+- BZ#3809: Inefficient plan is generated for queries with many (>= 24)
+  joined tables which take a long time or an HEAPalloc error. I get Error:
+  GDK reported error. HEAPalloc: Insufficient space for HEAP of 400000000
+  bytes.
+- BZ#3810: Fix statistics gathering
+- BZ#3811: NOT LIKE not working if the operand doesn't contains wildcards.
+- BZ#3813: COPY INTO fails on perfectly clean CSV file
+- BZ#3814: Server crash when using bitwise NOT operation in SQL query
+- BZ#3818: Crash when performing UNION/GROUP BY over tables with
+  different columns
+- BZ#3819: order of tables in FROM-clause has negative impact on generated
+  plan (using crossproducts instead of joins)
+- BZ#3820: mclient accepts table with repeated constraint which causes
+  crash on insert
+- BZ#3821: Unexpected error when using a number instead of a boolean
+- BZ#3822: Yet another LIKE operator issue
+- BZ#3825: MonetDB not cleaning intermediate results which leads to
+  filling up disk space and ultimately server crash
+
+* Sun Aug 30 2015 Sjoerd Mullender <[email protected]> - 11.21.7-20151020
+- clients: In the SQL formatter of mclient (the default) we now properly align
+  East Asian wide characters.
+
 * Mon Aug 24 2015 Sjoerd Mullender <[email protected]> - 11.21.5-20150824
 - Rebuilt.
 - BZ#3730: SAMPLE function not sampling randomly
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Sun Aug 30 2015 Sjoerd Mullender <[email protected]> - 11.21.7-20151020
+- In the SQL formatter of mclient (the default) we now properly align
+  East Asian wide characters.
+
 * Thu Feb 19 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807
 - Added a new output format to mclient: --format=expanded (or -fx).
   In this format, column values are shown in full and below each other.
diff --git a/clients/ChangeLog.Jul2015 b/clients/ChangeLog.Jul2015
--- a/clients/ChangeLog.Jul2015
+++ b/clients/ChangeLog.Jul2015
@@ -1,7 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Sun Aug 30 2015 Sjoerd Mullender <[email protected]>
-- In the SQL formatter of mclient (the default) we now properly align
-  East Asian wide characters.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+monetdb (11.21.7) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#3789: Query on large string table fails on HEAPextend
+  * BZ#3794: table function sys.rejects() and view sys.rejects() are listed
+    are metadata objects but give an (incorrect) error when they are queried
+  * BZ#3797: COPY INTO with incorrect number columns
+  * BZ#3798: SELECT query with INTERSECT causes assertion failure
+  * BZ#3800: LIKE is broken for many patterns
+  * BZ#3802: Disk space never freed: a logical ref is keeped on a deleted
+    BATs
+  * BZ#3803: SQL query parser fails to parse valid SELECT query with a
+    CASE .. END in it. It fails with parser error: identifier 'x' ambiguous
+  * BZ#3804: `monetdb status` command crashes under certain conditions
+  * BZ#3809: Inefficient plan is generated for queries with many (>= 24)
+    joined tables which take a long time or an HEAPalloc error. I get Error:
+    GDK reported error. HEAPalloc: Insufficient space for HEAP of 400000000
+    bytes.
+  * BZ#3810: Fix statistics gathering
+  * BZ#3811: NOT LIKE not working if the operand doesn't contains wildcards.
+  * BZ#3813: COPY INTO fails on perfectly clean CSV file
+  * BZ#3814: Server crash when using bitwise NOT operation in SQL query
+  * BZ#3818: Crash when performing UNION/GROUP BY over tables with
+    different columns
+  * BZ#3819: order of tables in FROM-clause has negative impact on generated
+    plan (using crossproducts instead of joins)
+  * BZ#3820: mclient accepts table with repeated constraint which causes
+    crash on insert
+  * BZ#3821: Unexpected error when using a number instead of a boolean
+  * BZ#3822: Yet another LIKE operator issue
+  * BZ#3825: MonetDB not cleaning intermediate results which leads to
+    filling up disk space and ultimately server crash
+
+ -- Sjoerd Mullender <[email protected]>  Tue, 20 Oct 2015 14:06:53 +0200
+
+monetdb (11.21.7) unstable; urgency=low
+
+  * clients: In the SQL formatter of mclient (the default) we now properly 
align
+    East Asian wide characters.
+
+ -- Sjoerd Mullender <[email protected]>  Sun, 30 Aug 2015 14:06:53 +0200
+
 monetdb (11.21.5) 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.12.jar monetdb-jdbc-2.17.jar jdbcclient.jar
+       FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.18.jar jdbcclient.jar
 }
 
 ant_distmerocontrol = {
diff --git a/java/build.properties b/java/build.properties
--- a/java/build.properties
+++ b/java/build.properties
@@ -9,7 +9,7 @@
 # major release number
 MCL_MAJOR=1
 # minor release number
-MCL_MINOR=12
+MCL_MINOR=13
 
 
 ##
@@ -19,7 +19,7 @@ MCL_MINOR=12
 # major release number
 JDBC_MAJOR=2
 # minor release number
-JDBC_MINOR=17
+JDBC_MINOR=18
 # 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.17</version>
+       <version>2.18</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.17 (Liberica/MCL-1.12)
+MonetDB JDBC driver version 2.18 (Liberica/MCL-1.13)
 Fabian Groffen <[email protected]>
 
-Release date: 2015-08-18
+Release date: 2015-10-20
 
 
 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:2:0
+GDK_VERSION=12:3:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=7:5:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=19:1:0
+MONETDB5_VERSION=19:2:0
 
 # 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