Changeset: bddc70baf058 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bddc70baf058 Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/gdk_bat.c gdk/libbat.rc libversions monetdb5/tools/libmonetdb5.rc tools/merovingian/daemon/merovingian.c vertoo.data Branch: default Log Message:
Merge with Jul2017 branch. diffs (138 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -671,3 +671,5 @@ 54a8c9d99dc3621a02579db0c59309781caceb54 05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_21 c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release 05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_SP4_release +8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_23 +8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_SP5_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -132,7 +132,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Dec2016-SP5/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -953,6 +953,24 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Mon May 29 2017 Panagiotis Koutsourakis <[email protected]> - 11.25.23-20170529 +- Rebuilt. +- BZ#6290: Crash (and assertion failure) with a correlated subquery with + NOT IN in the select-list +- BZ#6291: crash if executes a function with sample operator +- BZ#6294: Sqlitelogictest crash +- BZ#6296: Another sqllitelogictest crash :( +- BZ#6297: 7th sqllitelogictest crash :( +- BZ#6300: Protect against missing BATs (sqlsmith) +- BZ#6314: Lateral crash report (sqlsmith) +- BZ#6315: Exist operator on type bigint missing (sqlsmith) +- BZ#6316: Coalesc and limit error (sqlsmith) +- BZ#6317: Two-column integer aggregation extremely slow +- BZ#6318: Daemon crashes if .merovignian_properties for a database + contains more than 42 entries +- BZ#6320: The daemon ignores all but the last entry in the + .merovignian_properties file when spawning mserver5 + * Tue Apr 25 2017 Sjoerd Mullender <[email protected]> - 11.25.21-20170425 - Rebuilt. - BZ#6260: Sqlitelogictest crash diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +monetdb (11.25.23) unstable; urgency=low + + * Rebuilt. + * BZ#6290: Crash (and assertion failure) with a correlated subquery with + NOT IN in the select-list + * BZ#6291: crash if executes a function with sample operator + * BZ#6294: Sqlitelogictest crash + * BZ#6296: Another sqllitelogictest crash :( + * BZ#6297: 7th sqllitelogictest crash :( + * BZ#6300: Protect against missing BATs (sqlsmith) + * BZ#6314: Lateral crash report (sqlsmith) + * BZ#6315: Exist operator on type bigint missing (sqlsmith) + * BZ#6316: Coalesc and limit error (sqlsmith) + * BZ#6317: Two-column integer aggregation extremely slow + * BZ#6318: Daemon crashes if .merovignian_properties for a database + contains more than 42 entries + * BZ#6320: The daemon ignores all but the last entry in the + .merovignian_properties file when spawning mserver5 + + -- Panagiotis Koutsourakis <[email protected]> Mon, 29 May 2017 10:09:01 +0200 + monetdb (11.25.21) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -136,6 +136,7 @@ BATcreatedesc(oid hseq, int tt, int heap bn->batDirty = TRUE; return bn; bailout: + BBPclear(bn->batCacheid); if (tt) HEAPfree(&bn->theap, 1); if (bn->tvheap) { @@ -213,6 +214,7 @@ BATnewstorage(oid hseq, int tt, BUN cap, } return bn; bailout: + BBPclear(bn->batCacheid); HEAPfree(&bn->theap, 1); GDKfree(bn); return NULL; 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=14:6:1 +GDK_VERSION=14:7:1 # version of the MAPI library (subdirectory clients/mapilib) -MAPI_VERSION=8:1:0 +MAPI_VERSION=8:2:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=22:6:1 +MONETDB5_VERSION=22:7:1 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=9:0:1 +STREAM_VERSION=9:1:1 diff --git a/tools/merovingian/daemon/merovingian.c b/tools/merovingian/daemon/merovingian.c --- a/tools/merovingian/daemon/merovingian.c +++ b/tools/merovingian/daemon/merovingian.c @@ -334,13 +334,13 @@ main(int argc, char *argv[]) * hardcoded bin-dir */ _mero_mserver = get_bin_path(); if (_mero_mserver != NULL) { - /* replace the trailing monetdbd by mserver5, fits nicely since - * they happen to be of same length */ - char *s = strrchr(_mero_mserver, '/'); - if (s != NULL && strcmp(s + 1, "monetdbd") == 0) { - s++; - *s++ = 'm'; *s++ = 's'; *s++ = 'e'; *s++ = 'r'; - *s++ = 'v'; *s++ = 'e'; *s++ = 'r'; *s++ = '5'; + /* Find where the string monetdbd actually starts */ + char *s = strstr(_mero_mserver, "monetdbd"); + if (s != NULL && strncmp(s, "monetdbd", 8) == 0) { + /* Replace the 8 following characters with the characters mserver5. + * This should work even if the executables have prefixes or + * suffixes */ + strncpy(s, "mserver5", 8); if (stat(_mero_mserver, &sb) == -1) _mero_mserver = NULL; } _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
