Changeset: f7213a746f82 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f7213a746f82
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/ChangeLog
clients/mapilib/mapi.rc
clients/odbc/ChangeLog
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
tools/merovingian/ChangeLog
Branch: default
Log Message:
Step two towards a new stable branch "Jun2023".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Jun2023".
diffs (truncated from 352 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.46.0
+current_version = 11.48.0
commit = False
tag = False
@@ -30,4 +30,3 @@ serialize = {major},{minor},{patch}
[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
serialize = {major},{minor},{patch}
-
diff --git a/ChangeLog b/ChangeLog.Jun2023
copy from ChangeLog
copy to ChangeLog.Jun2023
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.46.0
+%global version 11.48.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.Jun2023
copy from clients/ChangeLog
copy to clients/ChangeLog.Jun2023
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog
--- a/clients/mapilib/ChangeLog
+++ b/clients/mapilib/ChangeLog
@@ -1,6 +1,3 @@
# ChangeLog file for mapilib
# This file is updated with Maddlog
-* Fri Sep 30 2022 Joeri van Ruth <[email protected]>
-- Deprecate mapi_setfilecallback() in favor of mapi_setfilecallback2() which
- can handle binary downloads. For the time being, the old callback still
works.
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Jun2023
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Jun2023
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,46,0)
- PRODUCTVERSION version(11,46,0)
+ FILEVERSION version(11,48,0)
+ PRODUCTVERSION version(11,48,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,46,0)
+ VALUE "FileVersion", sversion(11,48,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,46,0)
+ VALUE "ProductVersion", sversion(11,48,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,8 +1,3 @@
# ChangeLog file for odbc
# This file is updated with Maddlog
-* Thu Apr 13 2023 Martin van Dinther <[email protected]>
-- Enhanced SQLTables() by adding support for table type names: 'BASE TABLE',
- 'GLOBAL TEMPORARY' and 'LOCAL TEMPORARY' in parameter TableType. These are
- synonyms of: 'TABLE', 'GLOBAL TEMPORARY TABLE' and 'LOCAL TEMPORARY TABLE'.
-
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Jun2023
copy from clients/odbc/ChangeLog
copy to clients/odbc/ChangeLog.Jun2023
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,46,0)
- PRODUCTVERSION version(11,46,0)
+ FILEVERSION version(11,48,0)
+ PRODUCTVERSION version(11,48,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,46,0)
+ VALUE "FileVersion", sversion(11,48,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,46,0)
+ VALUE "ProductVersion", sversion(11,48,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,46,0)
- PRODUCTVERSION version(11,46,0)
+ FILEVERSION version(11,48,0)
+ PRODUCTVERSION version(11,48,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,46,0)
+ VALUE "FileVersion", sversion(11,48,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,46,0)
+ VALUE "ProductVersion", sversion(11,48,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 "46")
+set(MONETDB_VERSION_MINOR "48")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Jun2023
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Jun2023
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Jun2023
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Jun2023
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,46,0)
- PRODUCTVERSION version(11,46,0)
+ FILEVERSION version(11,48,0)
+ PRODUCTVERSION version(11,48,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,46,0)
+ VALUE "FileVersion", sversion(11,48,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,46,0)
+ VALUE "ProductVersion", sversion(11,48,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Jun2023
copy from geom/ChangeLog
copy to geom/ChangeLog.Jun2023
diff --git a/misc/ChangeLog b/misc/ChangeLog.Jun2023
copy from misc/ChangeLog
copy to misc/ChangeLog.Jun2023
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Jun2023
copy from monetdb5/ChangeLog
copy to monetdb5/ChangeLog.Jun2023
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,46,0)
- PRODUCTVERSION version(11,46,0)
+ FILEVERSION version(11,48,0)
+ PRODUCTVERSION version(11,48,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,46,0)
+ VALUE "FileVersion", sversion(11,48,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,46,0)
+ VALUE "ProductVersion", sversion(11,48,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,54 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Fri Apr 7 2023 Lucas Pereira <[email protected]>
-- Session timeout feature improve to start evaluating from the moment
- the procedure is called, instead of beginning of the session.
-
-* Fri Mar 3 2023 Lucas Pereira <[email protected]>
-- Queries stopped with the stop procedure are now marked as 'aborted'
- 'finished'.
-
-* Wed Feb 15 2023 Lucas Pereira <[email protected]>
-- SQL function sys.queue() overloaded with sys.queue(username string),
- SYSADMIN only, allowing to filter the global queue by username or
- use 'ALL' to retrive the global queue. Calling the function without
- arguments returns the current user queue.
-- SQL procedures sys.pause(tag bigint), sys.resume(tag bigint),
- sys.stop(tag bigint) overloaded with sys.pause(tag bigint, username string),
- sys.resume(tag bigint, username string) and sys.stop(tag bigint, username
- string), SYSADMIN only, allowing to pause, resume and stop query
- executions by TAG,USERNAME. The call without arguments is a public
- procedure giving access to users to pause, resume and stop their
- own query executions.
-
-* Wed Feb 15 2023 svetlin <[email protected]>
-- Added support of ODBC escape sequences syntax to SQL layer. Now all clients
- (including ODBC/JDBC/pymonetdb) can use them without further processing.
- For details on ODBC escape sequences syntax see:
-
https://learn.microsoft.com/en-us/sql/odbc/reference/appendixes/odbc-escape-sequences
-
-* Thu Nov 10 2022 Martin van Dinther <[email protected]>
-- It is no longer allowed to create a merge table or remote table or
- replica table or unlogged table in schema "tmp". The tmp schema is
- reserved for temporary objects only, such as local/global temp tables.
-
-* Thu Nov 3 2022 Martin van Dinther <[email protected]>
-- System views sys.dependency_tables_on_functions and
- dependency_views_on_functions have been extended with column: function_id.
-
-* Fri Sep 30 2022 Joeri van Ruth <[email protected]>
-- When loading data using COPY BINARY INTO, apply default values instead of
just
- inserting NULLs.
-- When loading data using COPY BINARY INTO, validate DECIMAL(n,k) and
- VARCHAR(n) column width.
-- When loading data using COPY BINARY INTO, string used to have their line
- endings converted from CR LF to LF. Do not do this, it is the responsibility
- of the client.
-- Implement dumping binary data using COPY SELECT ... INTO BINARY <file>.
-
-* Thu Aug 25 2022 Sjoerd Mullender <[email protected]>
-- Removed code for Workload Capture and Replace. The code was
- experimental, and it didn't work out. A different approach will
- be taken.
-
diff --git a/sql/ChangeLog b/sql/ChangeLog.Jun2023
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
