Changeset: 59865c32880a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/59865c32880a Modified Files: MonetDB.spec clients/examples/C/bincopydata.h clients/examples/C/streamcat.c clients/mapiclient/dump.c clients/mapiclient/msqldump.c clients/mapilib/connect_unix.c clients/mapilib/mapi.c clients/mapilib/mapi_intern.h clients/mapilib/msettings_internal.h clients/mapilib/parseurl.c clients/mapilib/writeurl.c clients/odbc/driver/ODBCError.c clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLDriverConnect.c clients/odbc/driver/SQLGetConnectAttr.c clients/odbc/driver/SQLGetDiagField.c clients/odbc/driver/SQLGetDiagRec.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c clients/odbc/setup/drvcfg.c cmake/monetdb-defines.cmake cmake/monetdb-versions.cmake common/stream/stdio_stream.c common/stream/stream.c common/stream/stream.h common/stream/stream_internal.h common/utils/CMakeLists.txt common/utils/msabaoth.c common/utils/mstring.c common/utils/mstring.h common/utils/mutils.c common/utils/ripemd160.h gdk/CMakeLists.txt gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_analytic.h gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c gdk/gdk_analytic_statistics.c gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_addsub.c gdk/gdk_calc_convert.c gdk/gdk_cand.c gdk/gdk_cand.h gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_hash.h gdk/gdk_heap.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_rtree.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_strimps.c gdk/gdk_string.c gdk/gdk_subquery.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_time.c gdk/gdk_tracer.c gdk/gdk_unique.c gdk/gdk_utils.c geom/lib/libgeom.h geom/monetdb5/geod.c geom/monetdb5/geom.c geom/monetdb5/geom.h geom/monetdb5/geomBulk.c geom/monetdb5/geom_atoms.c geom/monetdb5/geom_atoms.h monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_client.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_exception.h monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c 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_scenario.h monetdb5/mal/mel.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/inet-46.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.h monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/group.h monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/iterator.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mkey.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/txtsim.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_support.h monetdb_config.h.in sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi3/conversion.h sql/backends/monet5/UDF/pyapi3/conversion3.c sql/backends/monet5/UDF/pyapi3/convert_loops.h sql/backends/monet5/UDF/pyapi3/pyapi.h sql/backends/monet5/UDF/pyapi3/pyapi3.c sql/backends/monet5/UDF/pyapi3/pyheader.h sql/backends/monet5/UDF/pyapi3/pytypes.h sql/backends/monet5/UDF/pyapi3/type_conversion3.c sql/backends/monet5/UDF/rapi/rapi.c sql/backends/monet5/UDF/udf/CMakeLists.txt sql/backends/monet5/UDF/udf/udf.c sql/backends/monet5/UDF/udf/udf_impl.h sql/backends/monet5/dict.c sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/sql.c sql/backends/monet5/sql_bincopy.c sql/backends/monet5/sql_bincopyconvert.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_execute.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_scenario.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_subquery.c sql/backends/monet5/sql_time.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/csv/csv.c sql/backends/monet5/vaults/fits/CMakeLists.txt sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/netcdf/CMakeLists.txt sql/backends/monet5/vaults/netcdf/netcdf.c sql/backends/monet5/vaults/shp/CMakeLists.txt sql/backends/monet5/vaults/shp/shp.c sql/common/sql_types.c sql/common/sql_types.h sql/include/sql_catalog.h sql/scripts/10_sys_schema_extension.sql sql/scripts/52_describe.sql 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_psm.c sql/server/rel_remote.h sql/server/rel_rewriter.c sql/server/rel_select.c sql/server/rel_statistics.c sql/server/rel_statistics_functions.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/rel_updates.h sql/server/sql_atom.c sql/server/sql_parser.y sql/server/sql_semantic.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/sql_storage.h sql/storage/store.c tools/merovingian/client/monetdb.c tools/merovingian/daemon/argvcmds.c tools/merovingian/daemon/connections.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/proxy.c tools/merovingian/daemon/snapshot.c tools/merovingian/utils/control.c tools/monetdbe/monetdbe.c Branch: default Log Message:
Merge with Dec2025 branch. diffs (truncated from 12449 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/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 @@ * * 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/bincopyloops.c b/clients/examples/C/bincopyloops.c --- a/clients/examples/C/bincopyloops.c +++ b/clients/examples/C/bincopyloops.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/bincopytemporaldata.c b/clients/examples/C/bincopytemporaldata.c --- a/clients/examples/C/bincopytemporaldata.c +++ b/clients/examples/C/bincopytemporaldata.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/bincopyuuid.c b/clients/examples/C/bincopyuuid.c --- a/clients/examples/C/bincopyuuid.c +++ b/clients/examples/C/bincopyuuid.c _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
