From bbdec04d59ceeda7d1792c8250f6b10989cb239a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 12 Apr 2022 13:07:20 +0200 Subject: MDEV-24317 Data race in LOGGER::init_error_log at sql/log.cc:1443 and in LOGGER::error_log_print at sql/log.cc:1181 don't initialize error_log_handler_list in set_handlers() * error_log_handler_list is initialized to LOG_FILE early, in init_base() * set_handlers always reinitializes it to LOG_FILE, so it's pointless * after init_base() concurrent threads start using sql_log_warning, so following set_handlers() shouldn't modify error_log_handler_list without some protection --- extra/mariabackup/xtrabackup.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extra') diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 41461d6ece1..f745c6ba163 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -6576,7 +6576,7 @@ int main(int argc, char **argv) key_map_full.set_all(); logger.init_base(); - logger.set_handlers(LOG_FILE, LOG_NONE, LOG_NONE); + logger.set_handlers(LOG_NONE, LOG_NONE); mysql_mutex_init(key_LOCK_error_log, &LOCK_error_log, MY_MUTEX_INIT_FAST); -- cgit v1.2.1 From aec856073df12e95b68667587bfd8e469b60e7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 21 Apr 2022 12:02:36 +0300 Subject: WolfSSL v5.2.0-stable --- extra/wolfssl/CMakeLists.txt | 1 - extra/wolfssl/wolfssl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'extra') diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index bc51af05666..3faddbf49a2 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -94,7 +94,6 @@ ${WOLFCRYPT_SRCDIR}/md5.c ${WOLFCRYPT_SRCDIR}/memory.c ${WOLFCRYPT_SRCDIR}/pkcs12.c ${WOLFCRYPT_SRCDIR}/pwdbased.c -${WOLFCRYPT_SRCDIR}/rabbit.c ${WOLFCRYPT_SRCDIR}/random.c ${WOLFCRYPT_SRCDIR}/rsa.c ${WOLFCRYPT_SRCDIR}/sha.c diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl index c3513bf2573..e6c07a296d2 160000 --- a/extra/wolfssl/wolfssl +++ b/extra/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit c3513bf2573c30f6d2df815de216120e92142020 +Subproject commit e6c07a296d2996e8d5c3cc615dfc50013bbcc794 -- cgit v1.2.1