Changeset: f4fbdb3437bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f4fbdb3437bf
Modified Files:
.bumpversion.cfg
ChangeLog
MonetDB.spec
clients/ChangeLog
clients/mapilib/mapi.rc
clients/odbc/ChangeLog
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
common/stream/ChangeLog
debian/control
gdk/ChangeLog
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
Branch: default
Log Message:
Step two towards a new stable branch "Aug2024".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Aug2024".
diffs (truncated from 418 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.50.0
+current_version = 11.52.0
commit = False
tag = False
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Wed May 8 2024 Sjoerd Mullender <sjo...@acm.org>
-- The shared library (.dll aka .so files) now have the version number
- as part of the name. This should allow the building of compatibility
- versions that can be installed in parallel to the latest version.
-- Some of the Debian/Ubuntu packages have been renamed. The old monetdb5
- names have been changed to plain monetdb, and libmonetdb5-server-*
- packages have been renamed monetdb-*.
-- The names of some of the provided RPM files have been changed.
- References to the old MonetDB5 name have been removed. All packages
- are now just MonetDB.
-
diff --git a/ChangeLog b/ChangeLog.Aug2024
copy from ChangeLog
copy to ChangeLog.Aug2024
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -8,7 +8,7 @@
# Copyright August 2008 - 2023 MonetDB B.V.;
# Copyright 1997 - July 2008 CWI.
-%global version 11.50.0
+%global version 11.52.0
%bcond_with compat
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,25 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Thu Jan 25 2024 Sjoerd Mullender <sjo...@acm.org>
-- Msqldump now accepts --output and --outputdir options. When the
- --outputdir option is used, the dump is placed in the file dump.sql in
- the specified directory and all tables are dumped to separate CSV files.
- In this way it is feasible to edit the dump script by hand if needed,
- even for a large database.
-
-* Wed Jan 24 2024 Sjoerd Mullender <sjo...@acm.org>
-- The --table (-t) option of msqldump now accepts SQL-style % wildcard
- characters to dump all tables that match the pattern. E.g. -t
- %test%.%test% dumps all tables with 'test' in both the schema and
- table name.
-
-* Wed Jan 10 2024 Sjoerd Mullender <sjo...@acm.org>
-- Implemented interrupt handling in mclient. When using mclient
- interactively, an interrupt (usually control-C) stops whatever the
- client is doing. When editing a line, the line is discarded; when
- editing a second or later line of a query, the whole query is discarded;
- when a query is being executed, the server is asked to stop the query
- at its earliest convenience. Stopping a running query can only be
- done with an up-to-date server. All of this does not work on Windows.
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Aug2024
copy from clients/ChangeLog
copy to clients/ChangeLog.Aug2024
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Aug2024
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Aug2024
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,50,0)
- PRODUCTVERSION version(11,50,0)
+ FILEVERSION version(11,52,0)
+ PRODUCTVERSION version(11,52,0)
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,50,0)
+ VALUE "FileVersion", sversion(11,52,0)
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,50,0)
+ VALUE "ProductVersion", sversion(11,52,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog
--- a/clients/odbc/ChangeLog
+++ b/clients/odbc/ChangeLog
@@ -1,25 +1,3 @@
# ChangeLog file for odbc
# This file is updated with Maddlog
-* Fri May 24 2024 Joeri van Ruth <joeri.van.r...@monetdbsolutions.com>
-- ODBC now supports TLS. It can be configured through the following
- DSN- or Connection String attributes (canonical name / user friendly name):
- TLS / Encrypt = ON/OFF
- CERT / Server Certificate = PATH
- CERTHASH / Server Certificate Hash = sha256:HEXDIGITS
- CLIENTKEY / Client Key = PATH
- CLIENTCERT / Client Certificate = PATH
-- Several more connection properties have been made configurable:
- SCHEMA / Schema = NAME
- TIMEZONE / Time Zone = Minutes East Of UTC
- REPLYSIZE / Reply Size = NUMBER
- LOGFILE / Log File = PATH
- LOGINTIMEOUT / Login Timeout = MILLISECONDS
- CONNECTIONTIMEOUT / Connection Timeout = MILLISECONDS
- AUTOCOMMIT / Autocommit = ON/OFF
- SOCK / Unix Socket = PATH (unix only)
-- SQLBrowseConnect() adds On/Off suggestions to boolean settings
- and prioritizes the DATABASE attribute if it notices monetdbd
- requires one. Apart from that only UID/User and PWD/Password
- are required, all others have sensible defaults.
-
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Aug2024
copy from clients/odbc/ChangeLog
copy to clients/odbc/ChangeLog.Aug2024
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,50,0)
- PRODUCTVERSION version(11,50,0)
+ FILEVERSION version(11,52,0)
+ PRODUCTVERSION version(11,52,0)
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,50,0)
+ VALUE "FileVersion", sversion(11,52,0)
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,50,0)
+ VALUE "ProductVersion", sversion(11,52,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,50,0)
- PRODUCTVERSION version(11,50,0)
+ FILEVERSION version(11,52,0)
+ PRODUCTVERSION version(11,52,0)
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,50,0)
+ VALUE "FileVersion", sversion(11,52,0)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,50,0)
+ VALUE "ProductVersion", sversion(11,52,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
@@ -11,7 +11,7 @@
#]]
set(MONETDB_VERSION_MAJOR "11")
-set(MONETDB_VERSION_MINOR "50")
+set(MONETDB_VERSION_MINOR "52")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog
--- a/common/stream/ChangeLog
+++ b/common/stream/ChangeLog
@@ -1,12 +1,3 @@
# ChangeLog file for stream
# This file is updated with Maddlog
-* Fri May 3 2024 Sjoerd Mullender <sjo...@acm.org>
-- ICONV support has been removed from the stream library. The server
- itself only needs UTF-8 support. The client (mclient) does have
- iconv support.
-
-* Wed Feb 21 2024 Sjoerd Mullender <sjo...@acm.org>
-- CURL support has been removed from the stream library. If support is
- needed, look at the source code in either streamcat.c or mclient.c.
-
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Aug2024
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Aug2024
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,26 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Fri May 3 2024 Sjoerd Mullender <sjo...@acm.org>
-- Various changes were made having to do with things like case-insensitive
- comparisons and converting to upper or lower case. Case insensitive
- comparison (i.e. the ILIKE operator) uses case folding which is similar
- to converting to lower case, but changes more characters, also sometimes
- to multiple characters (e.g. German sharp s (ß) comparse equal to SS).
-
-* Tue Mar 26 2024 Sjoerd Mullender <sjo...@acm.org>
-- Made some changes to how BAT descriptors are allocated. They are now
- allocated in bulk, meaning fewer malloc/free calls during processing.
-- Removed macro BBP_cache and its associated code. Checking whether a
- BAT is cached (loaded in memory) can be done by checking the BBPLOADED
- bit in the BBP_status value. Getting a pointer to the BAT descriptor
- can be done by using BBP_desc.
-
-* Tue Feb 6 2024 Sjoerd Mullender <sjo...@acm.org>
-- The SQL transaction ID is no longer saved in the BBP.dir file.
-
-* Wed Jan 3 2024 Sjoerd Mullender <sjo...@acm.org>
-- Made some changes to the TIMEOUT macros. Most importantly, they
- now get a pointer to a QryCtx structure as argument instead of the
- timeout value.
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Aug2024
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Aug2024
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,50,0)
- PRODUCTVERSION version(11,50,0)
+ FILEVERSION version(11,52,0)
+ PRODUCTVERSION version(11,52,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
- VALUE "FileVersion", sversion(11,50,0)
+ VALUE "FileVersion", sversion(11,52,0)
VALUE "InternalName", "libbat\0"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", sversion(11,50,0)
+ VALUE "ProductVersion", sversion(11,52,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Aug2024
copy from geom/ChangeLog
copy to geom/ChangeLog.Aug2024
diff --git a/misc/ChangeLog b/misc/ChangeLog.Aug2024
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
