From fe065f8d90b05c05ad9ca63a773a8f933b19e4eb Mon Sep 17 00:00:00 2001 From: Alexey Bychko Date: Mon, 22 Nov 2021 19:34:47 +0700 Subject: MDEV-22522 RPM packages have meaningless summary/description this patch moves cpack summury and description for optional packages to the appropriate CMakeLists.txt files --- extra/mariabackup/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'extra/mariabackup') diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt index 409dcd7efde..e39c1214c7a 100644 --- a/extra/mariabackup/CMakeLists.txt +++ b/extra/mariabackup/CMakeLists.txt @@ -16,11 +16,11 @@ OPTION(WITH_MARIABACKUP "Include mariabackup" ON) ADD_FEATURE_INFO(MARIABACKUP WITH_MARIABACKUP "MariaDB Backup Utility") + IF(NOT WITH_MARIABACKUP) RETURN() ENDIF() - IF(NOT WIN32) CHECK_SYMBOL_EXISTS(regcomp regex.h HAVE_SYSTEM_REGEX) IF(HAVE_SYSTEM_REGEX) @@ -28,7 +28,6 @@ IF(NOT WIN32) ENDIF() ENDIF() - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql -- cgit v1.2.1 From f809a4fbd069dc2986677eabde50b1a253f6695f Mon Sep 17 00:00:00 2001 From: ryancaicse <73822648+ryancaicse@users.noreply.github.com> Date: Wed, 10 Nov 2021 18:35:17 +0800 Subject: MDEV-26558 Fix a deadlock due to cyclic dependence Fix a potential deadlock bug between locks ctrl_mutex and entry->mutex --- extra/mariabackup/xbstream.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extra/mariabackup') diff --git a/extra/mariabackup/xbstream.cc b/extra/mariabackup/xbstream.cc index 5d33f27cbb3..ef5e3bccd9c 100644 --- a/extra/mariabackup/xbstream.cc +++ b/extra/mariabackup/xbstream.cc @@ -443,8 +443,8 @@ extract_worker_thread_func(void *arg) } if (chunk.type == XB_CHUNK_TYPE_EOF) { - pthread_mutex_lock(ctxt->mutex); pthread_mutex_unlock(&entry->mutex); + pthread_mutex_lock(ctxt->mutex); my_hash_delete(ctxt->filehash, (uchar *) entry); pthread_mutex_unlock(ctxt->mutex); -- cgit v1.2.1