Changeset: 245256a6a70d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=245256a6a70d
Modified Files:
        .hgtags
        MonetDB.spec
        buildtools/ChangeLog-Archive
        buildtools/ChangeLog.Jul2017
        debian/changelog
        gdk/ChangeLog-Archive
        gdk/ChangeLog.Jul2017
        libversions
        tools/merovingian/ChangeLog-Archive
        tools/merovingian/ChangeLog.Jul2017
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (249 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -675,3 +675,5 @@ 8b3d3f7c487cb6e34dab1167797a61862cba2124
 8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_SP5_release
 e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_1
 e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_release
+1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_3
+1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Jul2017/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jul2017-SP1/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1039,6 +1039,43 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Jul 25 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- Rebuilt.
+- BZ#6325: Merge table unusable in other connections
+- BZ#6328: Transactional/multi-connection issues with merge tables
+- BZ#6336: VALUES multiple inserts error
+- BZ#6339: Mserver5 crashes on nested SELECT
+- BZ#6340: sample operator takes effect after the execution of the query,
+  expected before
+- BZ#6341: MERGE TABLE issue: Cannot register
+- BZ#6342: MERGE TABLE issue: hang
+- BZ#6344: Spurious errors and assertions (SQLsmith)
+
+* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: The Debian and Ubuntu installers have been fixed: there was a 
file
+  missing in the Jul2017 release.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: Added a new RPM called MonetDB-selinux which provides the SELinux
+  policy required to run MonetDB under systemd, especially on Fedora 26.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- merovingian: monetdbd was leaking open file descriptors to the mserver5 
process
+  it started.  This has been fixed.
+
+* Fri Jul  7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: The Windows installers (*.msi files) are now created using the 
WiX
+  Toolset.
+- buildtools: The Windows binaries are now built using Visual Studio 2015.  
Because of
+  this, you may need to install the Visual C++ Redistributable for Visual
+  Studio 2015 before being able to run MonetDB.
+
+* Fri Jul  7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- gdk: Many functions in GDK are now annotated with the GCC attribute
+  __warn_unused_result__ meaning that the compiler will issue a warning
+  if the result of the function (usually an indication of an error)
+  is not used.
+
 * Wed Jul 05 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705
 - Rebuilt.
 - BZ#3465: Request: add support for CREATE VIEW with ORDER BY clause
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,21 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- The Debian and Ubuntu installers have been fixed: there was a file
+  missing in the Jul2017 release.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- Added a new RPM called MonetDB-selinux which provides the SELinux
+  policy required to run MonetDB under systemd, especially on Fedora 26.
+
+* Fri Jul  7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- The Windows installers (*.msi files) are now created using the WiX
+  Toolset.
+- The Windows binaries are now built using Visual Studio 2015.  Because of
+  this, you may need to install the Visual C++ Redistributable for Visual
+  Studio 2015 before being able to run MonetDB.
+
 * Tue Dec  6 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.1-20161214
 - New packages MonetDB-python2 (Fedora) and monetdb-python2 (Debian/Ubuntu)
   have been created for Python 2 integration into MonetDB.
diff --git a/buildtools/ChangeLog.Jul2017 b/buildtools/ChangeLog.Jul2017
--- a/buildtools/ChangeLog.Jul2017
+++ b/buildtools/ChangeLog.Jul2017
@@ -1,18 +1,3 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
-* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org>
-- The Debian and Ubuntu installers have been fixed: there was a file
-  missing in the Jul2017 release.
-
-* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org>
-- Added a new RPM called MonetDB-selinux which provides the SELinux
-  policy required to run MonetDB under systemd, especially on Fedora 26.
-
-* Fri Jul  7 2017 Sjoerd Mullender <sjo...@acm.org>
-- The Windows installers (*.msi files) are now created using the WiX
-  Toolset.
-- The Windows binaries are now built using Visual Studio 2015.  Because of
-  this, you may need to install the Visual C++ Redistributable for Visual
-  Studio 2015 before being able to run MonetDB.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,58 @@
+monetdb (11.27.3) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6325: Merge table unusable in other connections
+  * BZ#6328: Transactional/multi-connection issues with merge tables
+  * BZ#6336: VALUES multiple inserts error
+  * BZ#6339: Mserver5 crashes on nested SELECT
+  * BZ#6340: sample operator takes effect after the execution of the query,
+    expected before
+  * BZ#6341: MERGE TABLE issue: Cannot register
+  * BZ#6342: MERGE TABLE issue: hang
+  * BZ#6344: Spurious errors and assertions (SQLsmith)
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 25 Jul 2017 10:44:31 +0200
+
+monetdb (11.27.3) unstable; urgency=low
+
+  * buildtools: The Debian and Ubuntu installers have been fixed: there was a 
file
+    missing in the Jul2017 release.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 24 Jul 2017 10:44:31 +0200
+
+monetdb (11.27.3) unstable; urgency=low
+
+  * buildtools: Added a new RPM called MonetDB-selinux which provides the 
SELinux
+    policy required to run MonetDB under systemd, especially on Fedora 26.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 14 Jul 2017 10:44:31 +0200
+
+monetdb (11.27.3) unstable; urgency=low
+
+  * merovingian: monetdbd was leaking open file descriptors to the mserver5 
process
+    it started.  This has been fixed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 14 Jul 2017 10:44:31 +0200
+
+monetdb (11.27.3) unstable; urgency=low
+
+  * buildtools: The Windows installers (*.msi files) are now created using the 
WiX
+    Toolset.
+  * buildtools: The Windows binaries are now built using Visual Studio 2015.  
Because of
+    this, you may need to install the Visual C++ Redistributable for Visual
+    Studio 2015 before being able to run MonetDB.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 7 Jul 2017 10:44:31 +0200
+
+monetdb (11.27.3) unstable; urgency=low
+
+  * gdk: Many functions in GDK are now annotated with the GCC attribute
+    __warn_unused_result__ meaning that the compiler will issue a warning
+    if the result of the function (usually an indication of an error)
+    is not used.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 7 Jul 2017 10:44:31 +0200
+
 monetdb (11.27.1) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,12 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Jul  7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- Many functions in GDK are now annotated with the GCC attribute
+  __warn_unused_result__ meaning that the compiler will issue a warning
+  if the result of the function (usually an indication of an error)
+  is not used.
+
 * Wed Mar 15 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705
 - Improved error checking in the logger code (dealing with the write-ahead
   log); changed return types a several functions from int to gdk_return
diff --git a/gdk/ChangeLog.Jul2017 b/gdk/ChangeLog.Jul2017
--- a/gdk/ChangeLog.Jul2017
+++ b/gdk/ChangeLog.Jul2017
@@ -1,9 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Fri Jul  7 2017 Sjoerd Mullender <sjo...@acm.org>
-- Many functions in GDK are now annotated with the GCC attribute
-  __warn_unused_result__ meaning that the compiler will issue a warning
-  if the result of the function (usually an indication of an error)
-  is not used.
-
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=15:0:0
+GDK_VERSION=15:1:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=9:0:0
+MAPI_VERSION=9:1:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=23:0:0
+MONETDB5_VERSION=23:1:0
 
 # version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=10:0:2
+STREAM_VERSION=10:1:2
diff --git a/tools/merovingian/ChangeLog-Archive 
b/tools/merovingian/ChangeLog-Archive
--- a/tools/merovingian/ChangeLog-Archive
+++ b/tools/merovingian/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- monetdbd was leaking open file descriptors to the mserver5 process
+  it started.  This has been fixed.
+
 * Thu May 11 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.27.1-20170705
 - Added handling of a dbextra property per database at the daemon
   level. The user can set the dbextra property for a database using the
diff --git a/tools/merovingian/ChangeLog.Jul2017 
b/tools/merovingian/ChangeLog.Jul2017
--- a/tools/merovingian/ChangeLog.Jul2017
+++ b/tools/merovingian/ChangeLog.Jul2017
@@ -1,7 +1,3 @@
 # ChangeLog file for sql/src/backends/monet5/merovingian
 # This file is updated with mchangelog
 
-* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org>
-- monetdbd was leaking open file descriptors to the mserver5 process
-  it started.  This has been fixed.
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to