summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryancaicse <73822648+ryancaicse@users.noreply.github.com>2021-11-10 18:35:17 +0800
committerRobert Bindar <robert@mariadb.org>2021-11-24 12:57:44 +0200
commitf809a4fbd069dc2986677eabde50b1a253f6695f (patch)
tree89e598bb12d6f1c909564c7bbd1fec5313ea3c82
parentef179dadf4700f323c507421e850be8dc7547aa8 (diff)
downloadmariadb-git-f809a4fbd069dc2986677eabde50b1a253f6695f.tar.gz
MDEV-26558 Fix a deadlock due to cyclic dependencebb-10.2-robert
Fix a potential deadlock bug between locks ctrl_mutex and entry->mutex
-rw-r--r--extra/mariabackup/xbstream.cc2
1 files changed, 1 insertions, 1 deletions
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);