Changeset: 2e46d4e96f8e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/2e46d4e96f8e Modified Files: clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-findpackages.cmake cmake/monetdb-versions.cmake common/utils/matomic.h gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_cand.h gdk/gdk_interprocess.c gdk/gdk_interprocess.h gdk/gdk_private.h gdk/gdk_storage.c gdk/libbat.rc monetdb5/mal/mal.h monetdb5/mal/mal_prelude.c monetdb5/mal/mal_prelude.h monetdb5/mal/mal_session.c monetdb5/modules/mal/tablet.h monetdb5/optimizer/opt_bincopyfrom.c monetdb5/tools/libmonetdb5.rc monetdb_config.h.in sql/backends/monet5/sql.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/storage/bat/bat_storage.c tools/mserver/CMakeLists.txt Branch: default Log Message:
Merge with Jan2022 branch. diffs (truncated from 12597 to 300 lines): diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. #]] cmake_minimum_required(VERSION 3.12) diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. #]] @PACKAGE_INIT@ diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. # python mkodbcwxs.py VERSION BITS PREFIX > PREFIX/MonetDB-ODBC-Installer.wxs # "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch x64/x86 PREFIX/MonetDB-ODBC-Installer.wxs diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. # python mksqlwxs.py VERSION BITS PREFIX > PREFIX/MonetDB5-SQL-Installer.wxs # "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch x64/x86 PREFIX/MonetDB5-SQL-Installer.wxs diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -147,4 +147,4 @@ This Source Code Form is subject to the License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt --- a/buildtools/CMakeLists.txt +++ b/buildtools/CMakeLists.txt @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. #]] add_subdirectory(conf) diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt --- a/buildtools/conf/CMakeLists.txt +++ b/buildtools/conf/CMakeLists.txt @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. #]] if(WIN32) diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -5,7 +5,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. usage() { cat >&2 <<-EOF diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -3,7 +3,7 @@ This Source Code Form is subject to the License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c --- a/buildtools/coverity_model.c +++ b/buildtools/coverity_model.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ /* diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. #]] add_subdirectory(mapiclient) diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt --- a/clients/NT/CMakeLists.txt +++ b/clients/NT/CMakeLists.txt @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. #]] # These files have to be installed in the root of the project. But you diff --git a/clients/NT/mclient.bat b/clients/NT/mclient.bat --- a/clients/NT/mclient.bat +++ b/clients/NT/mclient.bat @@ -2,7 +2,7 @@ @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. @REM -@REM Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +@REM Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. @echo off rem figure out the folder name diff --git a/clients/NT/msqldump.bat b/clients/NT/msqldump.bat --- a/clients/NT/msqldump.bat +++ b/clients/NT/msqldump.bat @@ -2,7 +2,7 @@ @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. @REM -@REM Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +@REM Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. @rem figure out the folder name @set MONETDB=%~dp0 diff --git a/clients/examples/C/CMakeLists.txt b/clients/examples/C/CMakeLists.txt --- a/clients/examples/C/CMakeLists.txt +++ b/clients/examples/C/CMakeLists.txt @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. #]] if(TESTING) diff --git a/clients/examples/C/bincopydata.c b/clients/examples/C/bincopydata.c --- a/clients/examples/C/bincopydata.c +++ b/clients/examples/C/bincopydata.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #include "bincopydata.h" diff --git a/clients/examples/C/bincopydata.h b/clients/examples/C/bincopydata.h --- a/clients/examples/C/bincopydata.h +++ b/clients/examples/C/bincopydata.h @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #include "monetdb_config.h" diff --git a/clients/examples/C/bincopyloops.c b/clients/examples/C/bincopyloops.c --- a/clients/examples/C/bincopyloops.c +++ b/clients/examples/C/bincopyloops.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #include "bincopydata.h" diff --git a/clients/examples/C/bincopytemporaldata.c b/clients/examples/C/bincopytemporaldata.c --- a/clients/examples/C/bincopytemporaldata.c +++ b/clients/examples/C/bincopytemporaldata.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #include "bincopydata.h" diff --git a/clients/examples/C/bincopyuuid.c b/clients/examples/C/bincopyuuid.c --- a/clients/examples/C/bincopyuuid.c +++ b/clients/examples/C/bincopyuuid.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #include "bincopydata.h" diff --git a/clients/examples/C/sample0.c b/clients/examples/C/sample0.c --- a/clients/examples/C/sample0.c +++ b/clients/examples/C/sample0.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #include <stdlib.h> diff --git a/clients/examples/C/sample1.c b/clients/examples/C/sample1.c --- a/clients/examples/C/sample1.c +++ b/clients/examples/C/sample1.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #include <stdlib.h> diff --git a/clients/examples/C/sample4.c b/clients/examples/C/sample4.c --- a/clients/examples/C/sample4.c +++ b/clients/examples/C/sample4.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #include <stdlib.h> diff --git a/clients/examples/C/smack00.c b/clients/examples/C/smack00.c --- a/clients/examples/C/smack00.c +++ b/clients/examples/C/smack00.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #ifdef _MSC_VER diff --git a/clients/examples/C/smack01.c b/clients/examples/C/smack01.c --- a/clients/examples/C/smack01.c +++ b/clients/examples/C/smack01.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ #ifdef _MSC_VER diff --git a/clients/examples/C/streamcat.c b/clients/examples/C/streamcat.c --- a/clients/examples/C/streamcat.c +++ b/clients/examples/C/streamcat.c _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
