Changeset: b0031a1a477a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b0031a1a477a
Modified Files:
.bumpversion.cfg
ChangeLog
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/ChangeLog
gdk/libbat.rc
monetdb5/ChangeLog
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
Branch: default
Log Message:
Step two towards a new stable branch "Dec2023".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Dec2023".
diffs (truncated from 368 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.48.0
+current_version = 11.50.0
commit = False
tag = False
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Mon Oct 30 2023 Sjoerd Mullender <sjo...@acm.org>
-- The ranges of merge partitions are now pushed down into the low
- level GDK operations, giving them a handle to sometimes execute more
- efficiently.
-
-* Thu Jul 27 2023 Niels Nes <ni...@cwi.nl>
-- Removed the PYTHON MAP external language option, as after a fork the
- synchronization primitives could be in any state, leading to deadlocks.
- During the upgrade function definitions will fallback to the normal
- PYTHON language option.
-
-* Mon Jul 17 2023 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com>
-- Implemented direct masking for strimp construction. The strimps
- datastructure now keeps an array of 65K 64-bit integers that is zero
- everywhere except at the indexes that correspond to header pairs. The
- entry for the nth pair in order has the nth bit of the bitstring
- on. These can be used to quickly construct bitstrings.
diff --git a/ChangeLog b/ChangeLog.Dec2023
copy from ChangeLog
copy to ChangeLog.Dec2023
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.48.0
+%global version 11.50.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/ChangeLog b/clients/ChangeLog.Dec2023
copy from clients/ChangeLog
copy to clients/ChangeLog.Dec2023
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Dec2023
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Dec2023
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,48,0)
- PRODUCTVERSION version(11,48,0)
+ FILEVERSION version(11,50,0)
+ PRODUCTVERSION version(11,50,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,48,0)
+ VALUE "FileVersion", sversion(11,50,0)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,48,0)
+ VALUE "ProductVersion", sversion(11,50,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Dec2023
copy from clients/odbc/ChangeLog
copy to clients/odbc/ChangeLog.Dec2023
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,48,0)
- PRODUCTVERSION version(11,48,0)
+ FILEVERSION version(11,50,0)
+ PRODUCTVERSION version(11,50,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,48,0)
+ VALUE "FileVersion", sversion(11,50,0)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,48,0)
+ VALUE "ProductVersion", sversion(11,50,0)
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,48,0)
- PRODUCTVERSION version(11,48,0)
+ FILEVERSION version(11,50,0)
+ PRODUCTVERSION version(11,50,0)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", sversion(11,48,0)
+ VALUE "FileVersion", sversion(11,50,0)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,48,0)
+ VALUE "ProductVersion", sversion(11,50,0)
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
@@ -9,7 +9,7 @@
#]]
set(MONETDB_VERSION_MAJOR "11")
-set(MONETDB_VERSION_MINOR "48")
+set(MONETDB_VERSION_MINOR "50")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Dec2023
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Dec2023
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,14 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Thu Nov 2 2023 Sjoerd Mullender <sjo...@acm.org>
-- Removed the compiled-in limit on the number of threads that can be used.
- The number of threads are still limited, but the limit is dictated
- solely by the operating system and the availability of enough memory.
-
-* Thu Sep 28 2023 Sjoerd Mullender <sjo...@acm.org>
-- We now prevent accidental upgrades from a database without 128 bit
- integers to one with 128 bit integers (also known as HUGEINT) from
- happening. Upgrades will only be done if the server is started with
- the option --set allow_hge_upgrade=yes.
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Dec2023
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Dec2023
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.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,48,0)
- PRODUCTVERSION version(11,48,0)
+ FILEVERSION version(11,50,0)
+ PRODUCTVERSION version(11,50,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
- VALUE "FileVersion", sversion(11,48,0)
+ VALUE "FileVersion", sversion(11,50,0)
VALUE "InternalName", "libbat\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", sversion(11,48,0)
+ VALUE "ProductVersion", sversion(11,50,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Dec2023
copy from geom/ChangeLog
copy to geom/ChangeLog.Dec2023
diff --git a/misc/ChangeLog b/misc/ChangeLog.Dec2023
copy from misc/ChangeLog
copy to misc/ChangeLog.Dec2023
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,14 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Fri Oct 20 2023 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com>
-- Change how json is stored in the database: We now normalize json
- strings after parsing, removing whitespace and eliminating duplicate
- keys in objects.
-- The function json.filter now properly returns json scalars instead of
- wrapping them in an array.
-
-* Wed Sep 13 2023 Sjoerd Mullender <sjo...@acm.org>
-- Removed the MAL tokenizer module. It was never usable from SQL and
- in this form never would be.
-
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Dec2023
copy from monetdb5/ChangeLog
copy to monetdb5/ChangeLog.Dec2023
diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc
--- a/monetdb5/tools/libmonetdb5.rc
+++ b/monetdb5/tools/libmonetdb5.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,48,0)
- PRODUCTVERSION version(11,48,0)
+ FILEVERSION version(11,50,0)
+ PRODUCTVERSION version(11,50,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB5 Library DLL\0"
- VALUE "FileVersion", sversion(11,48,0)
+ VALUE "FileVersion", sversion(11,50,0)
VALUE "InternalName", "libmonetdb5\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libmonetdb5.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB5 Server\0"
- VALUE "ProductVersion", sversion(11,48,0)
+ VALUE "ProductVersion", sversion(11,50,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,45 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Thu Aug 24 2023 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
-- Added ISO/IEC 9075-11 SQL/Schemata (SQL:2011) with SQL system views:
- information_schema.schemata
- information_schema.tables
- information_schema.views
- information_schema.columns
- information_schema.character_sets
- information_schema.check_constraints
- information_schema.table_constraints
- information_schema.referential_constraints
- information_schema.routines
- information_schema.sequences
-
- Most views have been extended (after the standard columns) with MonetDB
- specific information columns such as schema_id, table_id, column_id, etc.
- This simplifies filtering and joins with system tables/views in sys schema
- when needed.
-
- Note: MonetDB does NOT support catalog qualifiers in object names, so all the
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
