Changeset: b6db65216e92 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b6db65216e92 Branch: escape-sequences Log Message:
merged with default diffs (truncated from 3558 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -786,3 +786,5 @@ 47675351fec22d5d5dc81eec03dfa08f505afc99 44e45c9a451f6afd933773094ec25723f713d3be Jan2022_23 44e45c9a451f6afd933773094ec25723f713d3be Jan2022_SP5_release 43d4a717410d6f6692a16a878640fc7e0f248725 Jan2022_25 +43d4a717410d6f6692a16a878640fc7e0f248725 Jan2022_SP6_release +5c50a4071c86d1621e20a885a51cc36f2f23eec4 Sep2022_9 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -87,7 +87,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Sep2022/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Sep2022-SP1/%{name}-%{version}.tar.bz2 # The Fedora packaging document says we need systemd-rpm-macros for # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7 @@ -855,6 +855,50 @@ fi %endif %changelog +* Mon Nov 28 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- Rebuilt. +- GH#7330: Creating temporary table fails after reconnect +- GH#7333: DLLs fail to load on Windows with accented characters in path +- GH#7336: Selecting from a literal-value table returns wrong values +- GH#7339: MonetDB corrupted state after SIGKILL + +* Wed Nov 9 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- clients: Also dump the new options of CREATE USER. + +* Wed Nov 9 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- gdk: On Windows, use the wide-character interface of system calls when + dealing with the environment (i.e. file names and getenv()). +- gdk: Memory leaks have been fixed. +- gdk: Improved maintenance of the estimated number of distinct values in BATs. + The estimate helps in deciding which low-level algorithm to use. + +* Wed Nov 9 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- monetdb5: Fixed a crash when the server runs out of client contexts (i.e. more + concurrent clients than the server is configured to handle). +- monetdb5: A race condition in the SHA hash code was fixed which resulted in + occasional failed connection attempts when they occurred concurrently. + +* Wed Nov 9 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- sql: Improved the handling of the "idle" value in the sys.sessions function + and view. + +* Wed Oct 19 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- monetdb5: Fix a bug where the MAL optimizer would use the starttime of the + previous query to determine whether a query timeout occurred. + +* Thu Oct 13 2022 Martin van Dinther <[email protected]> - 11.45.9-20221128 +- odbc: Fixed issue with generated raw strings prefix when ODBC driver is used + against a server older than Jun2020 (11.37). + +* Wed Oct 12 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- merovingian: Stop logging references to monetdbd's logfile in said logfile. + +* Mon Oct 10 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- gdk: Offset heaps (.tailN files) were growing too fast and unnecessarily + under certain conditions. This has been fixed. Also, when such too + large files are now loaded into the system, it is recognized they are + too large and they are truncated to a more reasonable size. + * Fri Sep 23 2022 Sjoerd Mullender <[email protected]> - 11.45.7-20220923 - Rebuilt. diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Nov 9 2022 Sjoerd Mullender <[email protected]> - 11.45.9-20221128 +- Also dump the new options of CREATE USER. + * Wed Sep 21 2022 Sjoerd Mullender <[email protected]> - 11.45.3-20220921 - Dumping of function GRANTs was improved by adding the types of the function (and procedure) arguments. diff --git a/clients/ChangeLog.Sep2022 b/clients/ChangeLog.Sep2022 --- a/clients/ChangeLog.Sep2022 +++ b/clients/ChangeLog.Sep2022 @@ -1,6 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Wed Nov 9 2022 Sjoerd Mullender <[email protected]> -- Also dump the new options of CREATE USER. - 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 @@ -411,8 +411,8 @@ void *THRgetdata(int); int THRgettid(void); int THRhighwater(void); void THRsetdata(int, void *); -gdk_return TMsubcommit(BAT *bl); -gdk_return TMsubcommit_list(bat *restrict subcommit, BUN *restrict sizes, int cnt, lng logno, lng transid); +gdk_return TMsubcommit(BAT *bl) __attribute__((__warn_unused_result__)); +gdk_return TMsubcommit_list(bat *restrict subcommit, BUN *restrict sizes, int cnt, lng logno, lng transid) __attribute__((__warn_unused_result__)); void VALclear(ValPtr v); int VALcmp(const ValRecord *p, const ValRecord *q); void *VALconvert(int typ, ValPtr t); @@ -1069,16 +1069,12 @@ const char *malRef; void mal_atom_reset(void); ClientRec *mal_clients; MT_Lock mal_contextLock; -MT_Lock mal_copyLock; -MT_Lock mal_delayLock; _Noreturn void mal_exit(int status); int mal_init(char *modules[], bool embedded, const char *initpasswd); void mal_instruction_reset(void); void mal_module(const char *name, mel_atom *atoms, mel_func *funcs); void mal_module2(const char *name, mel_atom *atoms, mel_func *funcs, mel_init initfunc, const char *code); -MT_Lock mal_profileLock; str mal_quote(const char *msg, size_t size); -MT_Lock mal_remoteLock; void mal_reset(void); int mal_startup(void); void mal_unquote(char *msg); diff --git a/clients/mapiclient/dotmonetdb.c b/clients/mapiclient/dotmonetdb.c --- a/clients/mapiclient/dotmonetdb.c +++ b/clients/mapiclient/dotmonetdb.c @@ -117,7 +117,7 @@ parse_dotmonetdb(DotMonetdb *dotfile) } else if (strcmp(buf, "database") == 0) { dotfile->dbname = strdup(q); q = NULL; - } else if (strcmp(buf, "host") == 0) { + } else if (strcmp(buf, "host") == 0) { dotfile->host = strdup(q); q = NULL; } else if (strcmp(buf, "language") == 0) { @@ -146,7 +146,7 @@ parse_dotmonetdb(DotMonetdb *dotfile) } else if (strcmp(buf, "width") == 0) { dotfile->pagewidth = atoi(q); q = NULL; - } else if (strcmp(buf, "port") == 0) { + } else if (strcmp(buf, "port") == 0) { dotfile->port = atoi(q); q = NULL; } diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/mapiclient/mclient.c +++ b/clients/mapiclient/mclient.c @@ -3256,14 +3256,14 @@ main(int argc, char **argv) /* parse config file first, command line options override */ parse_dotmonetdb(&dotfile); - user = dotfile.user; - passwd = dotfile.passwd; + user = dotfile.user; + passwd = dotfile.passwd; dbname = dotfile.dbname; - language = dotfile.language; + language = dotfile.language; host = dotfile.host; save_history = dotfile.save_history; - output = dotfile.output; - pagewidth = dotfile.pagewidth; + output = dotfile.output; + pagewidth = dotfile.pagewidth; port = dotfile.port; pagewidthset = pagewidth != 0; if (language) { diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c --- a/clients/mapiclient/msqldump.c +++ b/clients/mapiclient/msqldump.c @@ -106,9 +106,9 @@ main(int argc, char **argv) #endif parse_dotmonetdb(&dotfile); - user = dotfile.user; - passwd = dotfile.passwd; - dbname = dotfile.dbname; + user = dotfile.user; + passwd = dotfile.passwd; + dbname = dotfile.dbname; host = dotfile.host; port = dotfile.port; diff --git a/clients/odbc/ChangeLog-Archive b/clients/odbc/ChangeLog-Archive --- a/clients/odbc/ChangeLog-Archive +++ b/clients/odbc/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Oct 13 2022 Martin van Dinther <[email protected]> - 11.45.9-20221128 +- Fixed issue with generated raw strings prefix when ODBC driver is used + against a server older than Jun2020 (11.37). + * Thu Sep 1 2022 Martin van Dinther <[email protected]> - 11.45.1-20220913 - Improved SQLSetPos(). It now allows RowNumber to be 0 when Operation is SQL_POSITION. diff --git a/clients/odbc/ChangeLog.Sep2022 b/clients/odbc/ChangeLog.Sep2022 --- a/clients/odbc/ChangeLog.Sep2022 +++ b/clients/odbc/ChangeLog.Sep2022 @@ -1,7 +1,3 @@ # ChangeLog file for odbc # This file is updated with Maddlog -* Thu Oct 13 2022 Martin van Dinther <[email protected]> -- Fixed issue with generated raw strings prefix when ODBC driver is used - against a server older than Jun2020 (11.37). - diff --git a/cmake/Modules/FindReadline.cmake b/cmake/Modules/FindReadline.cmake --- a/cmake/Modules/FindReadline.cmake +++ b/cmake/Modules/FindReadline.cmake @@ -9,22 +9,24 @@ find_package(PkgConfig QUIET) pkg_check_modules(PC_READLINE QUIET readline>=8.0) if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR PC_READLINE_FOUND) + if(NOT WIN32) -# Look for the header file. -find_path(READLINE_INCLUDE_DIR NAMES readline/readline.h - HINTS - ${PC_READLINE_INCLUDEDIR} - ${PC_READLINE_INCLUDE_DIRS} - PATH_SUFFIXES readline - ) + # Look for the header file. + find_path(READLINE_INCLUDE_DIR NAMES readline/readline.h + HINTS + ${PC_READLINE_INCLUDEDIR} + ${PC_READLINE_INCLUDE_DIRS} + PATH_SUFFIXES readline + ) -# Look for the library. -find_library(READLINE_LIBRARIES NAMES readline - HINTS - ${PC_READLINE_LIBDIR} - ${PC_READLINE_LIBRARY_DIRS} - ) + # Look for the library. + find_library(READLINE_LIBRARIES NAMES readline + HINTS + ${PC_READLINE_LIBDIR} + ${PC_READLINE_LIBRARY_DIRS} + ) + endif() endif() # Handle the QUIETLY and REQUIRED arguments and set READLINE_FOUND to TRUE if all listed variables are TRUE. diff --git a/cmake/monetdb-toolchain.cmake b/cmake/monetdb-toolchain.cmake --- a/cmake/monetdb-toolchain.cmake +++ b/cmake/monetdb-toolchain.cmake @@ -57,7 +57,16 @@ function(monetdb_default_compiler_option add_option_if_available("-Wundef") add_option_if_available("-Wformat=2") add_option_if_available("-Wformat-overflow=1") - #add_option_if_available("-Wno-format-truncation") + if(${CMAKE_C_COMPILER_ID} MATCHES "^GNU$") + if(${CMAKE_C_COMPILER_VERSION} VERSION_LESS "9.5.0") + # on Ubuntu 20.04 with gcc 9.4.0 when building a Release + # version we get a warning (hence error) about possible + # buffer overflow in a call to snprintf, this option avoids + # that; I have no idea which version of gcc is safe, so the + # test may have to be refined + add_option_if_available("-Wno-format-truncation") + endif() + endif() add_option_if_available("-Wno-format-nonliteral") #add_option_if_available("-Wformat-signedness") -- numpy messes this up add_option_if_available("-Wno-cast-function-type") diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -40,7 +40,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M # common/options and common/utils) set(GDK_VERSION_MAJOR "26") set(GDK_VERSION_MINOR "0") -set(GDK_VERSION_PATCH "1") +set(GDK_VERSION_PATCH "2") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}") # version of the MAPI library (subdirectory clients/mapilib) @@ -52,7 +52,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}. # version of the MONETDB5 library (subdirectory monetdb5, not including extras or sql) set(MONETDB5_VERSION_MAJOR "33") set(MONETDB5_VERSION_MINOR "0") -set(MONETDB5_VERSION_PATCH "1") +set(MONETDB5_VERSION_PATCH "2") set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}") # version of the MONETDBE library (subdirectory tools/monetdbe) @@ -64,11 +64,11 @@ set(MONETDBE_VERSION "${MONETDBE_VERSION # version of the STREAM library (subdirectory common/stream) set(STREAM_VERSION_MAJOR "26") set(STREAM_VERSION_MINOR "0") -set(STREAM_VERSION_PATCH "0") +set(STREAM_VERSION_PATCH "1") _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
