Changeset: 8ab9d3064728 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8ab9d3064728
Modified Files:
sql/backends/monet5/sql.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: sql_profiler
Log Message:
Merge with default.
diffs (truncated from 1043 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.44.0
+current_version = 11.46.0
commit = False
tag = False
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -770,3 +770,4 @@ 1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3
59de1ee118d4eccc072c0cf3938f90635a7db311 Jan2022_15
59de1ee118d4eccc072c0cf3938f90635a7db311 Jan2022_SP3_release
38ba6e40ba9148c762fe4a4b40f4937f86e516b6 Jul2021_25
+470e524a786ee0e94c7901ec98d95ac351a0e472 Sep2022_root
diff --git a/ChangeLog b/ChangeLog.Sep2022
copy from ChangeLog
copy to ChangeLog.Sep2022
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.44.0
+%global version 11.46.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.Sep2022
copy from clients/ChangeLog
copy to clients/ChangeLog.Sep2022
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Sep2022
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Sep2022
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,44,0)
- PRODUCTVERSION version(11,44,0)
+ FILEVERSION version(11,46,0)
+ PRODUCTVERSION version(11,46,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,44,0)
+ VALUE "FileVersion", sversion(11,46,0)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2022\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,44,0)
+ VALUE "ProductVersion", sversion(11,46,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,68 +1,3 @@
# ChangeLog file for odbc
# This file is updated with Maddlog
-* Thu Jul 14 2022 Martin van Dinther <[email protected]>
-- Removed the possibility to retrieve or set the CURRENT_CATALOG
- via SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, ...) and
- SQLSetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, ...) as MonetDB does
- not support CATALOG objects (no SQL support for: CREATE CATALOG abc
- or SET CATALOG abc) and therefore there is no CURRENT_CATALOG.
-
-* Thu Jun 23 2022 Martin van Dinther <[email protected]>
-- Corrected ODBC functions SQLTablePrivileges() and SQLColumnPrivileges()
- for local temporary tables located in schema tmp. They did not return
- any rows when the temporary table had privileges set. Now they do return
- rows as expected.
-
-* Wed Jun 22 2022 Martin van Dinther <[email protected]>
-- Improved SQLProcedures() and SQLProcedureColumns(). They now list
- information also for all built-in system procedures and functions, not
- only those created via SQL. Also corrected the value of ORDINAL_POSITION
- for scalar function arguments. It would start at 2 instead of 1.
-- Extended output of SQLProcedures() and SQLProcedureColumns() resultsets
- with an extra column SPECIFIC_NAME. This column contains the name which
- uniquely identifies this procedure or function within its schema. As
- MonetDB supports overloaded procedures and functions, the combination of
- PROCEDURE_SCHEM and PROCEDURE_NAME is not enough to uniquely identify
- a procedure or function. This extra column allows you to correctly
- match the corresponding rows returned by SQLProcedureColumns() with the
- specific rows of SQLProcedures(). This extra column SPECIFIC_NAME is
- implemented similar to the JDBC DatabaseMetaData methods getProcedures()
- and getProcedureColumns().
-
-* Thu Jun 9 2022 Martin van Dinther <[email protected]>
-- For SQLForeignKeys() corrected the output of columns UPDATE_RULE and
- DELETE_RULE. These columns used to always return 3 (= SQL_NO_ACTION)
- but now they will report the action codes as specified in the FOREIGN KEY
- CONSTRAINT construction.
-
-* Thu Jun 2 2022 Martin van Dinther <[email protected]>
-- Fixed issue in function SQLProcedureColumns(). When the argument ColumnName
- was not empty it generated an invalid SQL query which failed with error:
- SELECT: no such column 'c.name'. This has been resolved.
-- Corrected implementation of SQLGetInfo(hdbc, SQL_MAX_DRIVER_CONNECTIONS,
...).
- It used to always return 64. Now it returns the value from the MonetDB
server.
-- Changed the column names case of the result sets as returned by
- SQLTables(), SQLColumns(), SQLSpecialColumns(), SQLPrimaryKeys(),
- SQLForeignKeys(), SQLStatistics(), SQLTablePrivileges(),
- SQLColumnPrivileges(), SQLProcedures() and SQLProcedureColumns(). The
- column names where all in lowercase but the ODBC specification defines
- them in uppercase, so changed them to uppercase.
-
-* Thu May 19 2022 Martin van Dinther <[email protected]>
-- Corrected SQLSpecialColumns(..., SQL_BEST_ROWID, ...). Previously it only
- returned rows when the table had a primary key. Now it also returns
- rows when a table has a unique constraint.
-- Corrected SQLStatistics(..., SQL_INDEX_ALL, ...). Previously it only
- returned rows when the table had a primary or unique key. Now it also
- returns rows for indices which are not based on a key.
-- Corrected SQLStatistics(..., SQL_ENSURE). It now returns CARDINALITY
- information for columns based on a primary/unique key. Previously it
- always returned NULL for the CARDINALITY result column.
-
-* Thu Apr 21 2022 Martin van Dinther <[email protected]>
-- Corrected ODBC functions SQLPrimaryKeys(), SQLSpecialColumns() and
- SQLStatistics() for local temporary tables located in schema tmp. They did
- not return any rows when the temp table had a primary or unique key or
- index. Now they do return rows as expected.
-
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Sep2022
copy from clients/odbc/ChangeLog
copy to clients/odbc/ChangeLog.Sep2022
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,44,0)
- PRODUCTVERSION version(11,44,0)
+ FILEVERSION version(11,46,0)
+ PRODUCTVERSION version(11,46,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,44,0)
+ VALUE "FileVersion", sversion(11,46,0)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2022\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,44,0)
+ VALUE "ProductVersion", sversion(11,46,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,44,0)
- PRODUCTVERSION version(11,44,0)
+ FILEVERSION version(11,46,0)
+ PRODUCTVERSION version(11,46,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,44,0)
+ VALUE "FileVersion", sversion(11,46,0)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2022"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,44,0)
+ VALUE "ProductVersion", sversion(11,46,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
@@ -7,7 +7,7 @@
#]]
set(MONETDB_VERSION_MAJOR "11")
-set(MONETDB_VERSION_MINOR "44")
+set(MONETDB_VERSION_MINOR "46")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Sep2022
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Sep2022
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,39 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Fri Jul 29 2022 Sjoerd Mullender <[email protected]>
-- The abort_on_error paramter of all GDK-level functions has been removed.
- Errors (e.g. overflow) now also results in an error.
-
-* Wed Jul 13 2022 Sjoerd Mullender <[email protected]>
-- Implemented BC/AD (and BCE/CE) suffixes when parsing dates.
-
-* Thu Jun 2 2022 Panagiotis Koutsourakis <[email protected]>
-- The interface for using strimps has not changed (create an imprint index
- on a column of a read only table), but now construction happens at the
- beginning of the first query that uses the strimp and is performed in
- a multithreaded manner.
-
-* Thu May 12 2022 Panagiotis Koutsourakis <[email protected]>
-- Implemented the use of strimps for NOT LIKE queries. The idea is to
- run the corresponding LIKE query using strimps and take the complement
- of the result. We keep around NULL values both during strimp filtering
- and during the pcre part of the LIKE query so that they get discarded
- automatically when we take the complement.
-
-* Mon Mar 21 2022 Sjoerd Mullender <[email protected]>
-- The function BBPkeepref now gets a BAT pointer as argument instead of
- a bat id.
-
-* Fri Mar 18 2022 Sjoerd Mullender <[email protected]>
-- Get rid of macro Tsize, use ->twidth instead.
-- Get rid of macro BUNlast, just use BATcount instead.
-
-* Mon Jan 31 2022 Sjoerd Mullender <[email protected]>
-- The BLOB type has been moved into the GDK layer.
-
-* Tue Jan 25 2022 Sjoerd Mullender <[email protected]>
-- When adding or subtracting months from a date or timestamp value,
- clamp the result to the calculated month instead of wrapping to the
- beginning of the next month. See bug 7227.
-
diff --git a/gdk/ChangeLog.Jan2022 b/gdk/ChangeLog.Jan2022
--- a/gdk/ChangeLog.Jan2022
+++ b/gdk/ChangeLog.Jan2022
@@ -1,6 +1,11 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
+* Wed Aug 10 2022 Sjoerd Mullender <[email protected]>
+- A bug was fixed when upgrading a database from the Oct2020 releases
+ (11.39.X) or older when the write-ahead log (WAL) was not empty and
+ contained instructions to create new tables.
+
* Tue Aug 2 2022 Sjoerd Mullender <[email protected]>
- When destroying a bat, make sure there are no files left over in
the BACKUP directory since they can cause problems when the bat id
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Sep2022
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Sep2022
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,44,0)
- PRODUCTVERSION version(11,44,0)
+ FILEVERSION version(11,46,0)
+ PRODUCTVERSION version(11,46,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,44,0)
+ VALUE "FileVersion", sversion(11,46,0)
VALUE "InternalName", "libbat\0"
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
