Changeset: c55bbe84a97b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c55bbe84a97b Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test clients/Tests/exports.stable.out monetdb5/mal/mal_embedded.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_statement.h sql/backends/monet5/vaults/CMakeLists.txt sql/common/sql_types.c sql/server/CMakeLists.txt sql/server/rel_basetable.h sql/server/rel_prop.h sql/server/rel_rel.h sql/server/rel_remote.c sql/server/rel_remote.h sql/server/rel_select.c sql/server/sql_parser.y tools/mserver/mserver5.c Branch: odbc_loader Log Message:
merge with default diffs (truncated from 22317 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -836,3 +836,4 @@ dce400b68239412b1835fb28bd183bf50f5e8692 ab5d60be21cd1c65e9de476d71a86c2995f70785 Aug2024_5 ab5d60be21cd1c65e9de476d71a86c2995f70785 Aug2024_SP1_release 30e6380820842b9e0325536eb22d7cb3843ab095 Aug2024_7 +30e6380820842b9e0325536eb22d7cb3843ab095 Aug2024_SP2_release diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. @@ -923,6 +923,7 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd -DWITH_PCRE=ON \ -DWITH_PROJ=OFF \ -DWITH_READLINE=ON \ + -DWITH_SQLPARSE=OFF \ -DWITH_VALGRIND=OFF \ -DWITH_XML2=ON \ -DWITH_ZLIB=ON diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -149,6 +149,6 @@ 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 2024 MonetDB Foundation; +Copyright 2024, 2025 MonetDB Foundation; Copyright August 2008 - 2023 MonetDB B.V.; Copyright 1997 - July 2008 CWI. diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt --- a/buildtools/CMakeLists.txt +++ b/buildtools/CMakeLists.txt @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt --- a/buildtools/conf/CMakeLists.txt +++ b/buildtools/conf/CMakeLists.txt @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -7,7 +7,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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -5,7 +5,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 2024 MonetDB Foundation; +Copyright 2024, 2025 MonetDB Foundation; Copyright August 2008 - 2023 MonetDB B.V.; Copyright 1997 - July 2008 CWI. --> diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c --- a/buildtools/coverity_model.c +++ b/buildtools/coverity_model.c @@ -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 2024 MonetDB Foundation; + * Copyright 2024, 2025 MonetDB Foundation; * Copyright August 2008 - 2023 MonetDB B.V.; * Copyright 1997 - July 2008 CWI. */ diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt --- a/clients/NT/CMakeLists.txt +++ b/clients/NT/CMakeLists.txt @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/clients/NT/mclient.bat.in b/clients/NT/mclient.bat.in --- a/clients/NT/mclient.bat.in +++ b/clients/NT/mclient.bat.in @@ -4,7 +4,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 2024 MonetDB Foundation; +@REM Copyright 2024, 2025 MonetDB Foundation; @REM Copyright August 2008 - 2023 MonetDB B.V.; @REM Copyright 1997 - July 2008 CWI. diff --git a/clients/NT/msqldump.bat.in b/clients/NT/msqldump.bat.in --- a/clients/NT/msqldump.bat.in +++ b/clients/NT/msqldump.bat.in @@ -4,7 +4,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 2024 MonetDB Foundation; +@REM Copyright 2024, 2025 MonetDB Foundation; @REM Copyright August 2008 - 2023 MonetDB B.V.; @REM Copyright 1997 - July 2008 CWI. diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -43710,12 +43710,12 @@ str_2dec_lng; cast to dec(lng) and check for overflow calc max -pattern calc.max(X_0:any_1, X_1:any_1):any_1 +pattern calc.max(X_0:any_1, X_1:any_1...):any_1 CALCmax; Return max of V1 and V2 calc max_no_nil -pattern calc.max_no_nil(X_0:any_1, X_1:any_1):any_1 +pattern calc.max_no_nil(X_0:any_1, X_1:any_1...):any_1 CALCmax_no_nil; Return max of V1 and V2, ignoring nil values calc @@ -43730,12 +43730,12 @@ mbrFromString; (empty) calc min -pattern calc.min(X_0:any_1, X_1:any_1):any_1 +pattern calc.min(X_0:any_1, X_1:any_1...):any_1 CALCmin; Return min of V1 and V2 calc min_no_nil -pattern calc.min_no_nil(X_0:any_1, X_1:any_1):any_1 +pattern calc.min_no_nil(X_0:any_1, X_1:any_1...):any_1 CALCmin_no_nil; Return min of V1 and V2, ignoring nil values calc diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -32325,12 +32325,12 @@ str_2dec_lng; cast to dec(lng) and check for overflow calc max -pattern calc.max(X_0:any_1, X_1:any_1):any_1 +pattern calc.max(X_0:any_1, X_1:any_1...):any_1 CALCmax; Return max of V1 and V2 calc max_no_nil -pattern calc.max_no_nil(X_0:any_1, X_1:any_1):any_1 +pattern calc.max_no_nil(X_0:any_1, X_1:any_1...):any_1 CALCmax_no_nil; Return max of V1 and V2, ignoring nil values calc @@ -32345,12 +32345,12 @@ mbrFromString; (empty) calc min -pattern calc.min(X_0:any_1, X_1:any_1):any_1 +pattern calc.min(X_0:any_1, X_1:any_1...):any_1 CALCmin; Return min of V1 and V2 calc min_no_nil -pattern calc.min_no_nil(X_0:any_1, X_1:any_1):any_1 +pattern calc.min_no_nil(X_0:any_1, X_1:any_1...):any_1 CALCmin_no_nil; Return min of V1 and V2, ignoring nil values calc diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1634,6 +1634,7 @@ sql_table *mvc_bind_table(mvc *c, sql_sc str mvc_commit(mvc *c, int chain, const char *name, bool enabling_auto_commit); int mvc_create_column(sql_column **col, mvc *m, sql_table *t, const char *name, sql_subtype *tpe); int mvc_create_table(sql_table **t, mvc *m, sql_schema *s, const char *name, int tt, bit system, int persistence, int commit_action, int sz, bit properties); +void mvc_query_processed(mvc *m); int mvc_result_column(backend *be, const char *tn, const char *name, const char *typename, int digits, int scale, BAT *b); int mvc_result_table(backend *be, oid query_id, int nr_cols, mapi_query_t type); str mvc_rollback(mvc *c, int chain, const char *name, bool disabling_auto_commit); @@ -1653,7 +1654,6 @@ list *rel_projections(mvc *sql, sql_rel void res_tables_destroy(res_table *results); list *sa_list(allocator *sa); char *sa_message(allocator *sa, _In_z_ _Printf_format_string_ const char *format, ...) __attribute__((__format__(__printf__, 2, 3))); -void scanner_query_processed(struct scanner *s); str sht_dec2_bte(bte *res, const int *s1, const sht *v); str sht_dec2_dbl(dbl *res, const int *s1, const sht *v); str sht_dec2_flt(flt *res, const int *s1, const sht *v); 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 @@ -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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] 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 @@ -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 2024 MonetDB Foundation; _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
