summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc2
-rw-r--r--extra/wolfssl/CMakeLists.txt1
m---------extra/wolfssl/wolfssl0
3 files changed, 1 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 0b0d8cb808e..9a6f836d11c 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -6707,7 +6707,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);
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
-Subproject c3513bf2573c30f6d2df815de216120e9214202
+Subproject e6c07a296d2996e8d5c3cc615dfc50013bbcc79