Changeset: 6d686dbe87a5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6d686dbe87a5 Modified Files: clients/mapiclient/dump.c gdk/gdk.h gdk/gdk_align.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_compare.h 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_private.h gdk/gdk_qsort.c gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_ssort.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_unique.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/str.h monetdb5/modules/mal/pcre.c monetdb5/modules/mal/txtsim.c sql/backends/monet5/UDF/rapi/rapi.c sql/backends/monet5/sql_cat.c sql/server/rel_schema.c sql/server/sql_mvc.c sql/server/sql_parser.y sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_storage.h sql/storage/sql_storage.h sql/storage/store.c Branch: ustr Log Message:
Merge with default branch. diffs (truncated from 13857 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]
