Changeset: 821862de0c13 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=821862de0c13
Modified Files:
        .hgtags
        MonetDB.spec
        debian/changelog
        libversions
        monetdb5/ChangeLog-Archive
        monetdb5/ChangeLog.Jul2015
Branch: default
Log Message:

Merge with Jul2015 branch.


diffs (141 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -615,3 +615,5 @@ d1dd6e5b7a5acfe14a33070e08c776341996deb2
 2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_SP1_release
 25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_13
 25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_SP2_release
+feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_15
+feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -104,7 +104,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
 Group: Applications/Databases
 License: MPLv2.0
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Jul2015-SP2/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jul2015-SP3/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -984,6 +984,34 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Mar 10 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.15-20160310
+- Rebuilt.
+- BZ#3549: bulk string operations very slow
+- BZ#3908: LEFT JOIN with OR conditions triggers assertion
+- BZ#3909: Incorrect column name in OR condition of LEFT JOIN crashes
+  mserver
+- BZ#3910: COPY INTO table (column1, column2) got wrong result
+- BZ#3912: When table/column names conflicts, data ends in multiple
+  tables!
+- BZ#3918: MonetDB.R version 1.0.1 incorrectly constructs the batfile
+  script
+- BZ#3919: Table conflict when the table name and fields are identical
+- BZ#3921: Creating a table from a complex query crashes mserver or
+  triggers assertion
+- BZ#3922: AVG( column ) returns NaN rather than Inf when column
+  contains Inf
+- BZ#3928: When killing a virtual machine, sql_logs/sql/log is empty
+- BZ#3930: Wrong typecast on character columns in prepared statements
+  when using Umlaute
+- BZ#3932: CASE expressions with constants are not evaluated correctly
+- BZ#3933: replace "exit" by "throw new Exception"
+- BZ#3937: bad BAT properties with binary copy into and NULL values
+- BZ#3940: Date calculation and comparison produce wrong result
+
+* Tue Jan  5 2016 Martin Kersten <m...@cwi.nl> - 11.21.15-20160310
+- monetdb5: Fixed potential crash in MAL debugger when accessing BATs by
+  index. Functionality dropped as it is also a security leak.
+
 * Tue Jan 05 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.13-20160105
 - Rebuilt.
 - BZ#2014: 'null' from copy into gets wrong
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+monetdb (11.21.15) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#3549: bulk string operations very slow
+  * BZ#3908: LEFT JOIN with OR conditions triggers assertion
+  * BZ#3909: Incorrect column name in OR condition of LEFT JOIN crashes
+    mserver
+  * BZ#3910: COPY INTO table (column1, column2) got wrong result
+  * BZ#3912: When table/column names conflicts, data ends in multiple
+    tables!
+  * BZ#3918: MonetDB.R version 1.0.1 incorrectly constructs the batfile
+    script
+  * BZ#3919: Table conflict when the table name and fields are identical
+  * BZ#3921: Creating a table from a complex query crashes mserver or
+    triggers assertion
+  * BZ#3922: AVG( column ) returns NaN rather than Inf when column
+    contains Inf
+  * BZ#3928: When killing a virtual machine, sql_logs/sql/log is empty
+  * BZ#3930: Wrong typecast on character columns in prepared statements
+    when using Umlaute
+  * BZ#3932: CASE expressions with constants are not evaluated correctly
+  * BZ#3933: replace "exit" by "throw new Exception"
+  * BZ#3937: bad BAT properties with binary copy into and NULL values
+  * BZ#3940: Date calculation and comparison produce wrong result
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 10 Mar 2016 09:31:09 +0100
+
+monetdb (11.21.15) unstable; urgency=low
+
+  * monetdb5: Fixed potential crash in MAL debugger when accessing BATs by
+    index. Functionality dropped as it is also a security leak.
+
+ -- Martin Kersten <m...@cwi.nl>  Tue, 5 Jan 2016 09:31:09 +0100
+
 monetdb (11.21.13) unstable; urgency=low
 
   * Rebuilt.
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:6:0
+GDK_VERSION=12:7:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=7:6:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=20:1:1
+MONETDB5_VERSION=20:2:1
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=7:0:0
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Sep  8 2015 Martin Kersten <m...@cwi.nl> - 11.21.15-20160310
+- Fixed potential crash in MAL debugger when accessing BATs by
+  index. Functionality dropped as it is also a security leak.
+
 * Thu Jan 29 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807
 - Implemented batcalc.min and batcalc.max.  Made calc.min and calc.max
   generic so that no other implementations are needed.
diff --git a/monetdb5/ChangeLog.Jul2015 b/monetdb5/ChangeLog.Jul2015
--- a/monetdb5/ChangeLog.Jul2015
+++ b/monetdb5/ChangeLog.Jul2015
@@ -1,7 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Tue Sep  8 2015 Martin Kersten <m...@cwi.nl>
-- Fixed potential crash in MAL debugger when accessing BATs by
-  index. Functionality dropped as it is also a security leak.
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to