Changeset: 1b6e480bcdd5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/1b6e480bcdd5 Modified Files: clients/mapiclient/mclient.1 gdk/gdk_batop.c misc/python/fixlicense.py tools/merovingian/client/monetdb.1 tools/merovingian/daemon/monetdbd.1.in tools/mserver/mserver5.1.in Branch: default Log Message:
Merge with Sep2022 branch. diffs (121 lines): diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1 --- a/clients/mapiclient/mclient.1 +++ b/clients/mapiclient/mclient.1 @@ -6,7 +6,7 @@ .\" .\" Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. .\" -.TH MCLIENT 1 "NOVEMBER 2012" MonetDB "MonetDB Applications" +.TH MCLIENT 1 2022-09-23 MonetDB "MonetDB Applications" .SH NAME mclient \- the MonetDB command-line tool .SH SYNOPSIS diff --git a/clients/odbc/ChangeLog.Sep2022 b/clients/odbc/ChangeLog.Sep2022 --- a/clients/odbc/ChangeLog.Sep2022 +++ b/clients/odbc/ChangeLog.Sep2022 @@ -1,3 +1,8 @@ # ChangeLog file for odbc # This file is updated with Maddlog +* Wed Dec 21 2022 Sjoerd Mullender <sjo...@acm.org> +- Prepare of a query where the sum of the number of parameters (question + marks in the query) and the number of output columns is larger than + 100 could fail with an unexpected error. This has been fixed. + diff --git a/debian/copyright b/debian/copyright --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Source: https://dev.monetdb.org/download Files: * Copyright: 1997 - July 2008 CWI - August 2008 - 2020 MonetDB B.V. + August 2008 - 2022 MonetDB B.V. License: 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 diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -1951,6 +1951,7 @@ bool BATordered(BAT *b) { lng t0 = GDKusec(); + bool sorted; MT_lock_set(&b->theaplock); if (b->ttype == TYPE_void || b->tsorted || BATcount(b) == 0) { @@ -2069,7 +2070,7 @@ BATordered(BAT *b) } } doreturn: - bool sorted = b->tsorted; + sorted = b->tsorted; MT_lock_unset(&b->theaplock); return sorted; } @@ -2107,6 +2108,7 @@ bool BATordered_rev(BAT *b) { lng t0 = GDKusec(); + bool revsorted; if (b == NULL || !ATOMlinear(b->ttype)) return false; @@ -2165,7 +2167,7 @@ BATordered_rev(BAT *b) TRC_DEBUG(ALGO, "Fixed revsorted for " ALGOBATFMT " (" LLFMT " usec)\n", ALGOBATPAR(b), GDKusec() - t0); } doreturn: - bool revsorted = b->trevsorted; + revsorted = b->trevsorted; MT_lock_unset(&b->theaplock); return revsorted; } diff --git a/misc/packages/deb/copyright b/misc/packages/deb/copyright --- a/misc/packages/deb/copyright +++ b/misc/packages/deb/copyright @@ -5,7 +5,7 @@ Source: https://dev.monetdb.org/download Files: * Copyright: 1997 - July 2008 CWI - August 2008 - 2020 MonetDB B.V. + August 2008 - 2022 MonetDB B.V. License: 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 diff --git a/tools/merovingian/client/monetdb.1 b/tools/merovingian/client/monetdb.1 --- a/tools/merovingian/client/monetdb.1 +++ b/tools/merovingian/client/monetdb.1 @@ -9,7 +9,7 @@ .\" Process this file with .\" groff -man -Tascii foo.1 .\" -.TH MONETDB 1 "NOVEMBER 2012" MonetDB "MonetDB Applications" +.TH MONETDB 1 2022-09-23 MonetDB "MonetDB Applications" .SH NAME monetdb \- control a MonetDB Database Server instance .SH SYNOPSIS diff --git a/tools/merovingian/daemon/monetdbd.1.in b/tools/merovingian/daemon/monetdbd.1.in --- a/tools/merovingian/daemon/monetdbd.1.in +++ b/tools/merovingian/daemon/monetdbd.1.in @@ -9,7 +9,7 @@ .\" Process this file with .\" groff -man -Tascii foo.1 .\" -.TH MONETDBD 1 "2021-04-12" MonetDB "MonetDB Applications" +.TH MONETDBD 1 2022-09-23 MonetDB "MonetDB Applications" .SH NAME monetdbd \- the MonetDB Database Server daemon .SH SYNOPSIS diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in --- a/tools/mserver/mserver5.1.in +++ b/tools/mserver/mserver5.1.in @@ -9,7 +9,7 @@ .\" Process this file with .\" groff -man -Tascii foo.1 .\" -.TH MSERVER5 1 "APRIL 2011" MonetDB "MonetDB Applications" +.TH MSERVER5 1 2022-09-23 MonetDB "MonetDB Applications" .SH NAME mserver5 \- the MonetDB server version 5 .SH SYNOPSIS _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
