Changeset: 0e61a4b230d8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0e61a4b230d8 Modified Files: clients/mapiclient/mhelp.c clients/odbc/tests/ODBCmetadata.c cmake/monetdb-defines.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-options.cmake common/stream/fwf.c common/stream/mapi_prompt.h common/utils/mstring.h gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.h gdk/gdk_tracer.h gdk/gdk_utils.c gdk/gdk_utils.h geom/monetdb5/geom.c monetdb5/mal/CMakeLists.txt monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_namespace.h monetdb5/mal/mal_private.h monetdb5/mal/mal_runtime.c monetdb5/mal/mel.h monetdb5/modules/atoms/str.c monetdb5/modules/kernel/CMakeLists.txt monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/group.c monetdb5/modules/mal/CMakeLists.txt monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/language.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h monetdb5/modules/mal/txtsim.c monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_dict.c monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_fastpath.c monetdb5/optimizer/opt_for.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb_config.h.in sql/backends/monet5/CMakeLists.txt sql/backends/monet5/UDF/pyapi3/pyapi3.c sql/backends/monet5/dict.c sql/backends/monet5/generator/generator.c sql/backends/monet5/mal_backend.c sql/backends/monet5/mal_backend.h sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/rel_physical.c sql/backends/monet5/rel_physical.h sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql_bincopyconvert.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_scenario.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_statistics.h sql/backends/monet5/vaults/CMakeLists.txt sql/backends/monet5/vaults/csv/csv.c sql/common/sql_list.c sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_list.h sql/include/sql_relation.h sql/scripts/CMakeLists.txt sql/server/CMakeLists.txt sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_file_loader.h sql/server/rel_optimize_others.c sql/server/rel_optimize_proj.c sql/server/rel_optimize_sel.c sql/server/rel_optimizer.c sql/server/rel_optimizer.h sql/server/rel_optimizer_private.h sql/server/rel_prop.c sql/server/rel_prop.h sql/server/rel_propagate.c sql/server/rel_rel.c sql/server/rel_rel.h sql/server/rel_rewriter.c sql/server/rel_select.c sql/server/rel_statistics.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/server/sql_partition.c sql/server/sql_scan.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_storage.h sql/storage/bat/bat_table.c sql/storage/objectset.c sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/test/testdb/Tests/dump.stable.out testing/Mtest.py.in testing/melcheck.py testing/sqllogictest.py tools/monetdbe/monetdbe.c Branch: pp_hashjoin Log Message:
Merge with default branch. diffs (truncated from 15011 to 300 lines): diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. #]] diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -3,7 +3,7 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. #]] diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -357,7 +357,7 @@ Exhibit A - Source Code Form License Not This Source Code Form is subject to the terms of the Mozilla Public 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/. + file, You can obtain one at https://mozilla.org/MPL/2.0/. If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -2,7 +2,7 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -2,7 +2,7 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -2,7 +2,7 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -25,7 +25,7 @@ __ DA_ .. _solutions: https://www.monetdbsolutions.com __ solutions_ -.. _mpl: http://mozilla.org/MPL/2.0/ +.. _mpl: https://mozilla.org/MPL/2.0/ __ mpl_ .. _MonetDB: https://dev.monetdb.org/hg/MonetDB/ @@ -149,7 +149,7 @@ SPDX-License-Identifier: MPL-2.0 This Source Code Form is subject to the terms of the Mozilla Public 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/. +file, You can obtain one at https://mozilla.org/MPL/2.0/. Copyright 2024 - 2026 MonetDB Foundation; Copyright August 2008 - 2023 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 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. #]] 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 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. #]] diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -5,7 +5,7 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. diff --git a/buildtools/conf/license.rtf b/buildtools/conf/license.rtf --- a/buildtools/conf/license.rtf +++ b/buildtools/conf/license.rtf @@ -158,7 +158,7 @@ \pard\plain\ltrpar\ql\sb440\sa60\s21\itap0{\s21\f0\fs28\b\lang1033{\*\listtag0}\abinodiroverride\ltrch Exhibit A - Source Code Form License Notice}{\s21\f0\fs28\b\lang1033{\*\listtag0}\par} \pard\plain\ltrpar\ql\li1440\ri1440\sa120\s2\itap0 \sect\sectd\sbknone\colsx360\headery0\footery0\pgncont\ltrsect -\pard\plain\ltrpar\ql\s28\itap0{\s28\f1\fs24\lang1033{\*\listtag0}\abinodiroverride\ltrch This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at }{\field{\*\fldinst {\f1\fs24\lang1033{\*\listtag0} HYPERLINK "http://mozilla.org/MPL/2.0/"}}{\*\fldrslt{\s28\f1\fs24\lang1033{\*\listtag0}http://mozilla.org/MPL/2.0/}}}{\s28\f1\fs24\lang1033{\*\listtag0}.}{\s28\f1\fs24\lang1033{\*\listtag0}\par} +\pard\plain\ltrpar\ql\s28\itap0{\s28\f1\fs24\lang1033{\*\listtag0}\abinodiroverride\ltrch This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at }{\field{\*\fldinst {\f1\fs24\lang1033{\*\listtag0} HYPERLINK "https://mozilla.org/MPL/2.0/"}}{\*\fldrslt{\s28\f1\fs24\lang1033{\*\listtag0}https://mozilla.org/MPL/2.0/}}}{\s28\f1\fs24\lang1033{\*\listtag0}.}{\s28\f1\fs24\lang1033{\*\listtag0}\par} \pard\plain\ltrpar\ql\s28\itap0{\s28\f0\fs24\lang1033{\*\listtag0}\abinodiroverride\ltrch If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.}{\s28\f0\fs24\lang1033{\*\listtag0}\par} \pard\plain\ltrpar\ql\s28\itap0{\s28\f0\fs24\lang1033{\*\listtag0}\abinodiroverride\ltrch You may add additional accurate notices of copyright ownership.}{\s28\f0\fs24\lang1033{\*\listtag0}\par} \pard\plain\ltrpar\ql\sb440\sa60\s21\itap0{\s21\f0\fs28\b\lang1033{\*\listtag0}\abinodiroverride\ltrch Exhibit B - \uc1\u8220\'93Incompatible With Secondary Licenses\uc1\u8221\'94 Notice}{\s21\f0\fs28\b\lang1033{\*\listtag0}\par} 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 @@ SPDX-License-Identifier: MPL-2.0 This Source Code Form is subject to the terms of the Mozilla Public 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/. +file, You can obtain one at https://mozilla.org/MPL/2.0/. For copyright information, see the file debian/copyright. --> 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 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * 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/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. * * For copyright information, see the file debian/copyright. */ diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -3,7 +3,7 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. #]] 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 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. #]] diff --git a/clients/NT/mclient.bat b/clients/NT/mclient.bat --- a/clients/NT/mclient.bat +++ b/clients/NT/mclient.bat @@ -2,9 +2,11 @@ @REM @REM This Source Code Form is subject to the terms of the Mozilla Public @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 file, You can obtain one at https://mozilla.org/MPL/2.0/. @REM -@REM For copyright information, see the file debian/copyright. +@REM Copyright 2024 - present MonetDB Foundation; +@REM Copyright August 2008 - 2023 MonetDB B.V.; +@REM Copyright 1997 - July 2008 CWI. @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,9 +2,11 @@ @REM @REM This Source Code Form is subject to the terms of the Mozilla Public @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 file, You can obtain one at https://mozilla.org/MPL/2.0/. @REM -@REM For copyright information, see the file debian/copyright. +@REM Copyright 2024 - present MonetDB Foundation; +@REM Copyright August 2008 - 2023 MonetDB B.V.; +@REM Copyright 1997 - July 2008 CWI. @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 @@ # # This Source Code Form is subject to the terms of the Mozilla Public # 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/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. # # For copyright information, see the file debian/copyright. #]] diff --git a/clients/examples/C/backrefencode.c b/clients/examples/C/backrefencode.c --- a/clients/examples/C/backrefencode.c +++ b/clients/examples/C/backrefencode.c @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * 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/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. * * For copyright information, see the file debian/copyright. */ diff --git a/clients/examples/C/bincopybackref.c b/clients/examples/C/bincopybackref.c --- a/clients/examples/C/bincopybackref.c +++ b/clients/examples/C/bincopybackref.c @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * 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/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. * * For copyright information, see the file debian/copyright. */ diff --git a/clients/examples/C/bincopybackref.h b/clients/examples/C/bincopybackref.h --- a/clients/examples/C/bincopybackref.h +++ b/clients/examples/C/bincopybackref.h @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * 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/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. * * For copyright information, see the file debian/copyright. */ 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 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * 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/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. * * For copyright information, see the file debian/copyright. */ 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 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * 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/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. * * For copyright information, see the file debian/copyright. */ diff --git a/clients/examples/C/bincopydecimal_impl.h b/clients/examples/C/bincopydecimal_impl.h --- a/clients/examples/C/bincopydecimal_impl.h +++ b/clients/examples/C/bincopydecimal_impl.h @@ -3,7 +3,7 @@ * _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
