Changeset: 06d8e1f8c508 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=06d8e1f8c508 Branch: scoping2 Log Message:
Merged with default diffs (223 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -789,3 +789,5 @@ cb4b3f021774b60ffd84c3004d341ec04de736f3 bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_5 cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_release +ac8254a47e87d0be9df2a623e2c2fcf67c0f982d Oct2020_7 +ac8254a47e87d0be9df2a623e2c2fcf67c0f982d Oct2020_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -97,7 +97,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Oct2020/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Oct2020-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 @@ -873,6 +873,22 @@ fi %postun -p /sbin/ldconfig %changelog +* Wed Nov 18 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.7-20201118 +- Rebuilt. +- BZ#6890: Add support of xz/lzma (de)compression on MS Windows +- BZ#6891: Add support of lz4 (de)compression on MS Windows +- BZ#6971: Parsing table returning function on remote server fails +- BZ#6981: Oct2020: PREPARE DDL statement silently fails +- BZ#6983: monetdb allows to use non-existing optimizer pipe +- BZ#6998: MAL profiler buffer limitations +- BZ#7001: crossproduct generated for a simple (semi-)join +- BZ#7003: Segfault on large chain of constant decimal multiplication +- BZ#7005: Dropping a STREAM TABLE does not remove the associated column + info from sys._columns +- BZ#7010: deallocate <id> results in all prepared statements being + deallocated (not error-related) +- BZ#7011: uuid() called only once when used in projection list + * Tue Oct 13 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.5-20201013 - Rebuilt. diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -50,7 +50,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) set(GDK_VERSION_CURRENT "21") -set(GDK_VERSION_REVISION "2") +set(GDK_VERSION_REVISION "3") set(GDK_VERSION_AGE "0") math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_AGE}") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_AGE}.${GDK_VERSION_REVISION}") @@ -64,21 +64,21 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}. # version of the MONETDB5 library (subdirectory monetdb5, not including extras or sql) set(MONETDB5_VERSION_CURRENT "30") -set(MONETDB5_VERSION_REVISION "1") +set(MONETDB5_VERSION_REVISION "2") set(MONETDB5_VERSION_AGE "0") math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} - ${MONETDB5_VERSION_AGE}") set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_AGE}.${MONETDB5_VERSION_REVISION}") # version of the MONETDBE library (subdirectory tools/monetdbe) set(MONETDBE_VERSION_CURRENT "1") -set(MONETDBE_VERSION_REVISION "0") +set(MONETDBE_VERSION_REVISION "1") set(MONETDBE_VERSION_AGE "0") math(EXPR MONETDBE_VERSION_MAJOR "${MONETDBE_VERSION_CURRENT} - ${MONETDBE_VERSION_AGE}") set(MONETDBE_VERSION "${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_AGE}.${MONETDBE_VERSION_REVISION}") # version of the STREAM library (subdirectory common/stream) set(STREAM_VERSION_CURRENT "14") -set(STREAM_VERSION_REVISION "1") +set(STREAM_VERSION_REVISION "2") set(STREAM_VERSION_AGE "0") math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} - ${STREAM_VERSION_AGE}") set(STREAM_VERSION "${STREAM_VERSION_MAJOR}.${STREAM_VERSION_AGE}.${STREAM_VERSION_REVISION}") diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +monetdb (11.39.7) unstable; urgency=low + + * Rebuilt. + * BZ#6890: Add support of xz/lzma (de)compression on MS Windows + * BZ#6891: Add support of lz4 (de)compression on MS Windows + * BZ#6971: Parsing table returning function on remote server fails + * BZ#6981: Oct2020: PREPARE DDL statement silently fails + * BZ#6983: monetdb allows to use non-existing optimizer pipe + * BZ#6998: MAL profiler buffer limitations + * BZ#7001: crossproduct generated for a simple (semi-)join + * BZ#7003: Segfault on large chain of constant decimal multiplication + * BZ#7005: Dropping a STREAM TABLE does not remove the associated column + info from sys._columns + * BZ#7010: deallocate <id> results in all prepared statements being + deallocated (not error-related) + * BZ#7011: uuid() called only once when used in projection list + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 18 Nov 2020 15:53:30 +0100 + monetdb (11.39.5) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog --- a/misc/packages/deb/changelog +++ b/misc/packages/deb/changelog @@ -1,3 +1,22 @@ +monetdb (11.39.7) unstable; urgency=low + + * Rebuilt. + * BZ#6890: Add support of xz/lzma (de)compression on MS Windows + * BZ#6891: Add support of lz4 (de)compression on MS Windows + * BZ#6971: Parsing table returning function on remote server fails + * BZ#6981: Oct2020: PREPARE DDL statement silently fails + * BZ#6983: monetdb allows to use non-existing optimizer pipe + * BZ#6998: MAL profiler buffer limitations + * BZ#7001: crossproduct generated for a simple (semi-)join + * BZ#7003: Segfault on large chain of constant decimal multiplication + * BZ#7005: Dropping a STREAM TABLE does not remove the associated column + info from sys._columns + * BZ#7010: deallocate <id> results in all prepared statements being + deallocated (not error-related) + * BZ#7011: uuid() called only once when used in projection list + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 18 Nov 2020 15:53:30 +0100 + monetdb (11.39.5) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog --- a/misc/packages/rpm/changelog +++ b/misc/packages/rpm/changelog @@ -1,3 +1,19 @@ +* Wed Nov 18 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.7-20201118 +- Rebuilt. +- BZ#6890: Add support of xz/lzma (de)compression on MS Windows +- BZ#6891: Add support of lz4 (de)compression on MS Windows +- BZ#6971: Parsing table returning function on remote server fails +- BZ#6981: Oct2020: PREPARE DDL statement silently fails +- BZ#6983: monetdb allows to use non-existing optimizer pipe +- BZ#6998: MAL profiler buffer limitations +- BZ#7001: crossproduct generated for a simple (semi-)join +- BZ#7003: Segfault on large chain of constant decimal multiplication +- BZ#7005: Dropping a STREAM TABLE does not remove the associated column + info from sys._columns +- BZ#7010: deallocate <id> results in all prepared statements being + deallocated (not error-related) +- BZ#7011: uuid() called only once when used in projection list + * Tue Oct 13 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.5-20201013 - Rebuilt. diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c --- a/monetdb5/mal/mal_authorize.c +++ b/monetdb5/mal/mal_authorize.c @@ -23,6 +23,8 @@ #include "mal_exception.h" #include "mal_private.h" #include "mcrypt.h" +#include "msabaoth.h" + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -60,6 +62,7 @@ static BAT *rt_hashedpwd = NULL; static BAT *rt_deleted = NULL; /* yep, the vault key is just stored in memory */ static str vaultKey = NULL; +static str master_password = NULL; void AUTHreset(void) { @@ -402,6 +405,12 @@ AUTHinitTables(const char *passwd) { /* normally, we'd commit here, but it's done already in AUTHaddUser */ } + if (!GDKinmemory(0)) { + msg = msab_pickSecret(&master_password); + if (msg != NULL) + return msg; + } + return(MAL_SUCCEED); } @@ -469,7 +478,6 @@ AUTHcheckCredentials( /* special case: users whose name starts with '.' can authenticate using * the temporary master password. */ - const char *master_password = GDKgetenv("master_password"); if (username[0] == '.' && master_password != NULL && master_password[0] != '\0') { // first encrypt the master password as if we've just found it // in the password store diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c --- a/tools/mserver/mserver5.c +++ b/tools/mserver/mserver5.c @@ -771,18 +771,10 @@ main(int argc, char **av) emergencyBreakpoint(); - if (!GDKinmemory(0)) { - char *secret = NULL; - if ((err = msab_pickSecret(&secret)) != NULL || (err = msab_registerStarted()) != NULL) { - /* throw the error at the user, but don't die */ - fprintf(stderr, "!%s\n", err); - free(err); - } - if (secret) { - if (GDKsetenv("master_password", secret) != GDK_SUCCEED) - fprintf(stderr, "GSKsetenv failed\n"); - free(secret); - } + if (!GDKinmemory(0) && (err = msab_registerStarted()) != NULL) { + /* throw the error at the user, but don't die */ + fprintf(stderr, "!%s\n", err); + free(err); } #ifdef SIGHUP _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
