Changeset: c49727ef7caa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c49727ef7caa
Branch: Dec2023
Log Message:
merged
diffs (truncated from 965 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.49.6
+current_version = 11.49.8
commit = False
tag = False
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -823,3 +823,4 @@ 1230526af30f40eeea30fb87c47c3e414920561f
95d8feaa1167b5ba87bd99253c3f4e62ebf528a1 Dec2023_3
dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_5
dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_SP1_release
+d656785f49ee62c19705722aa6b7c171904c64d5 Dec2023_7
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,7 +9,7 @@
# Copyright 1997 - July 2008 CWI.
%global name MonetDB
-%global version 11.49.6
+%global version 11.49.8
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -91,7 +91,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP2/%{name}-%{version}.tar.bz2
# The Fedora packaging document says we need systemd-rpm-macros for
# the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -922,6 +922,31 @@ fi
%endif
%changelog
+* Tue Apr 09 2024 Sjoerd Mullender <[email protected]> - 11.49.7-20240409
+- Rebuilt.
+- GH#7469: Crash when using `CONTAINS`
+- GH#7479: MonetDB server crashes in `exp_ref`
+- GH#7490: commonTerms optimizer no longer works
+- GH#7495: Crash when simultaneously querying and updating a string column.
+
+* Thu Mar 28 2024 Sjoerd Mullender <[email protected]> - 11.49.7-20240409
+- gdk: Threads have their own list of free bats. The list was not returned
+ to the system when a thread exited, meaning that the free bats that
+ were in the list would not be reused by any thread. This has been
+ fixed.
+
+* Tue Mar 19 2024 Sjoerd Mullender <[email protected]> - 11.49.7-20240409
+- monetdb5: Fixed interaction between mserver5 and remote mserver5 when only
one
+ of the two has 128 bit integer support.
+
+* Tue Mar 19 2024 Sjoerd Mullender <[email protected]> - 11.49.7-20240409
+- sql: Fixed issue where equal column aliases were created. When those
+ aliases were parsed on the remote side it could give crashes.
+
+* Mon Mar 18 2024 Sjoerd Mullender <[email protected]> - 11.49.7-20240409
+- gdk: Fixed a couple of deadlock situations, one actually observed, one
+ never observed.
+
* Tue Mar 12 2024 Sjoerd Mullender <[email protected]> - 11.49.5-20240312
- Rebuilt.
- GH#7390: Some MonetDB Server crashes found
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,49,6)
- PRODUCTVERSION version(11,49,6)
+ FILEVERSION version(11,49,8)
+ PRODUCTVERSION version(11,49,8)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,49,6)
+ VALUE "FileVersion", sversion(11,49,8)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,49,6)
+ VALUE "ProductVersion", sversion(11,49,8)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,49,6)
- PRODUCTVERSION version(11,49,6)
+ FILEVERSION version(11,49,8)
+ PRODUCTVERSION version(11,49,8)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,49,6)
+ VALUE "FileVersion", sversion(11,49,8)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,49,6)
+ VALUE "ProductVersion", sversion(11,49,8)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,49,6)
- PRODUCTVERSION version(11,49,6)
+ FILEVERSION version(11,49,8)
+ PRODUCTVERSION version(11,49,8)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB Foundation"
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", sversion(11,49,6)
+ VALUE "FileVersion", sversion(11,49,8)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,49,6)
+ VALUE "ProductVersion", sversion(11,49,8)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -12,7 +12,7 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "49")
-set(MONETDB_VERSION_PATCH "6")
+set(MONETDB_VERSION_PATCH "8")
if(RELEASE_VERSION)
set(MONETDB_RELEASE "unreleased")
@@ -44,7 +44,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_MAJOR "28")
set(GDK_VERSION_MINOR "1")
-set(GDK_VERSION_PATCH "1")
+set(GDK_VERSION_PATCH "2")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
@@ -56,13 +56,13 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_MAJOR "35")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "2")
+set(MONETDB5_VERSION_PATCH "3")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
# version of the MONETDBE library (subdirectory tools/monetdbe)
set(MONETDBE_VERSION_MAJOR "26")
set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "5")
+set(MONETDBE_VERSION_PATCH "6")
set(MONETDBE_VERSION
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
# version of the STREAM library (subdirectory common/stream)
@@ -74,5 +74,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
# version of the SQL library (subdirectory sql)
set(SQL_VERSION_MAJOR "14")
set(SQL_VERSION_MINOR "1")
-set(SQL_VERSION_PATCH "2")
+set(SQL_VERSION_PATCH "3")
set(SQL_VERSION
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+monetdb (11.49.7) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7469: Crash when using `CONTAINS`
+ * GH#7479: MonetDB server crashes in `exp_ref`
+ * GH#7490: commonTerms optimizer no longer works
+ * GH#7495: Crash when simultaneously querying and updating a string column.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Apr 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * gdk: Threads have their own list of free bats. The list was not returned
+ to the system when a thread exited, meaning that the free bats that
+ were in the list would not be reused by any thread. This has been
+ fixed.
+
+ -- Sjoerd Mullender <[email protected]> Thu, 28 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * monetdb5: Fixed interaction between mserver5 and remote mserver5 when only
one
+ of the two has 128 bit integer support.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 19 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * sql: Fixed issue where equal column aliases were created. When those
+ aliases were parsed on the remote side it could give crashes.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 19 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * gdk: Fixed a couple of deadlock situations, one actually observed, one
+ never observed.
+
+ -- Sjoerd Mullender <[email protected]> Mon, 18 Mar 2024 10:43:09 +0200
+
monetdb (11.49.5) 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,16 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Mar 28 2024 Sjoerd Mullender <[email protected]> - 11.49.7-20240409
+- Threads have their own list of free bats. The list was not returned
+ to the system when a thread exited, meaning that the free bats that
+ were in the list would not be reused by any thread. This has been
+ fixed.
+
+* Mon Mar 18 2024 Sjoerd Mullender <[email protected]> - 11.49.7-20240409
+- Fixed a couple of deadlock situations, one actually observed, one
+ never observed.
+
* Fri Mar 8 2024 Sjoerd Mullender <[email protected]> - 11.49.5-20240312
- The internal hash function for floating point types has been changed.
It is now no longer based on the bit representation, but on the value,
diff --git a/gdk/ChangeLog.Dec2023 b/gdk/ChangeLog.Dec2023
--- a/gdk/ChangeLog.Dec2023
+++ b/gdk/ChangeLog.Dec2023
@@ -1,13 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Thu Mar 28 2024 Sjoerd Mullender <[email protected]>
-- Threads have their own list of free bats. The list was not returned
- to the system when a thread exited, meaning that the free bats that
- were in the list would not be reused by any thread. This has been
- fixed.
-
-* Mon Mar 18 2024 Sjoerd Mullender <[email protected]>
-- Fixed a couple of deadlock situations, one actually observed, one
- never observed.
-
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -893,9 +893,6 @@ mskGetVal(BAT *b, BUN p)
* @item int
* @tab
* HEAPcopy (Heap *dst,*src);
- * @item int
- * @tab
- * HEAPwarm (Heap *h);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
