Changeset: 76905e6a95f6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76905e6a95f6 Modified Files: clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample4.c clients/examples/C/smack01.c clients/examples/python/sqlsample.py clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/msqldump.h clients/mapilib/mapi.c clients/mapilib/mapi.h clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/samples/odbcsample1.c clients/odbc/samples/testgetinfo.c clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake common/stream/bs2.c common/stream/socket_stream.c common/stream/stream.c common/stream/stream.h common/stream/stream_internal.h common/utils/matomic.h common/utils/mcrypt.c ctest/monetdb5/mal/test_malEmbeddedBoot.c ctest/tools/monetdbe/CMakeLists.txt ctest/tools/monetdbe/example_proxy.c ctest/tools/monetdbe/example_remote.c documentation/source/developers_handbook.rst gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_analytic.h gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_calc.h gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_sample.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_subquery.c gdk/gdk_system.h gdk/gdk_time.c gdk/gdk_time.h gdk/gdk_tm.c gdk/gdk_tracer.c gdk/gdk_utils.c gdk/libbat.rc monetdb5/extras/rapi/rapi.c monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_authorize.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_builder.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_embedded.c monetdb5/mal/mal_embedded.h monetdb5/mal/mal_exception.c monetdb5/mal/mal_exception.h monetdb5/mal/mal_function.c monetdb5/mal/mal_function.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_linker.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_prelude.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_scenario.c monetdb5/mal/mal_session.c monetdb5/modules/atoms/CMakeLists.txt monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/str.h monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/mmath.c monetdb5/modules/mal/CMakeLists.txt monetdb5/modules/mal/clients.c monetdb5/modules/mal/clients.h monetdb5/modules/mal/inspect.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/remote.h monetdb5/modules/mal/remote.mal monetdb5/modules/mal/tablet.c monetdb5/modules/mal/wlc.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_remoteQueries.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/CMakeLists.txt sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi3/conversion3.c sql/backends/monet5/UDF/pyapi3/pyapi3.c sql/backends/monet5/UDF/udf/udf.c sql/backends/monet5/UDF/udf/udf.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cast.h sql/backends/monet5/sql_cast_impl_int.h sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_fround.c sql/backends/monet5/sql_fround_impl.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_orderidx.c sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_rank.h sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_round.c sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_time.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/wlr.c sql/common/sql_backend.c sql/common/sql_backend.h sql/common/sql_types.c sql/common/sql_types.h sql/include/sql_catalog.h sql/include/sql_mem.h sql/include/sql_relation.h sql/jdbc/tests/Tests/JdbcClient_create_tables.sql sql/scripts/51_sys_schema_extension.sql sql/scripts/52_describe.sql sql/scripts/CMakeLists.txt sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_propagate.c sql/server/rel_psm.c sql/server/rel_psm.h sql/server/rel_rel.c sql/server/rel_rel.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_semantic.c sql/server/rel_sequence.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/rel_updates.h sql/server/sql_atom.c sql/server/sql_atom.h sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/server/sql_privileges.c sql/server/sql_privileges.h sql/server/sql_qc.h sql/server/sql_scan.c sql/server/sql_semantic.c sql/server/sql_semantic.h sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/test/mapi/Tests/python_dec38.py sql/test/mapi/Tests/python_int128.py testing/CMakeLists.txt testing/Mconvert.py.in testing/Mtest.py.in testing/Mz.py.bat testing/Mz.py.in testing/convert_to_sqllogic.sh testing/hashstableout.py testing/helpers.py testing/listexports.py.in testing/mktest.py testing/monetdb_mtest.bat.in testing/monetdb_mtest.sh.in testing/process.py testing/sqllogictest.py testing/sqltest.py tools/merovingian/daemon/controlrunner.c tools/monetdbe/CMakeLists.txt tools/monetdbe/monetdbe.c tools/monetdbe/monetdbe.h tools/monetdbe/monetdbe_mapi.c tools/monetdbe/monetdbe_mapi.h tools/mserver/mserver5.c tools/mserver/shutdowntest.c Branch: default Log Message:
Merge with Oct2020 branch. diffs (truncated from 13528 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 @@ -149,4 +149,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 - 2020 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +@REM Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. +@REM Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. @rem figure out the folder name @set MONETDB=%~dp0 diff --git a/clients/NT/stethoscope.bat b/clients/NT/stethoscope.bat --- a/clients/NT/stethoscope.bat +++ b/clients/NT/stethoscope.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 - 2020 MonetDB B.V. +@REM Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. @echo off rem figure out the folder name 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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. #]] if(TESTING) 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 - 2020 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2021 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 - 2020 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. */ #ifdef _MSC_VER diff --git a/clients/examples/CMakeLists.txt b/clients/examples/CMakeLists.txt --- a/clients/examples/CMakeLists.txt +++ b/clients/examples/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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. #]] add_subdirectory(C) diff --git a/clients/examples/perl/CMakeLists.txt b/clients/examples/perl/CMakeLists.txt --- a/clients/examples/perl/CMakeLists.txt +++ b/clients/examples/perl/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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. #]] if(TESTING) diff --git a/clients/examples/perl/malsample.pl b/clients/examples/perl/malsample.pl --- a/clients/examples/perl/malsample.pl +++ b/clients/examples/perl/malsample.pl @@ -4,7 +4,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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. use strict; use warnings; diff --git a/clients/examples/perl/sqlsample.pl b/clients/examples/perl/sqlsample.pl --- a/clients/examples/perl/sqlsample.pl +++ b/clients/examples/perl/sqlsample.pl @@ -4,7 +4,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 - 2020 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. use strict; use warnings; diff --git a/clients/examples/php/CMakeLists.txt b/clients/examples/php/CMakeLists.txt --- a/clients/examples/php/CMakeLists.txt +++ b/clients/examples/php/CMakeLists.txt _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
