summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-09 08:40:14 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-09 08:40:14 +0200
commit47ab793d71f2755b026672e4657174a1740b6ae2 (patch)
tree919aa71c2f31dbafa84a0e3b5fdf61f8d23afd3a /extra
parentde2fa9eced796a38bf2a194f35589f6eef814483 (diff)
parent524b4a89da3d9143ad72a82d73617ffde9e3a7a8 (diff)
downloadmariadb-git-47ab793d71f2755b026672e4657174a1740b6ae2.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/ds_compress.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/extra/mariabackup/ds_compress.cc b/extra/mariabackup/ds_compress.cc
index 3c28e55e1fe..514c86f5a17 100644
--- a/extra/mariabackup/ds_compress.cc
+++ b/extra/mariabackup/ds_compress.cc
@@ -370,6 +370,7 @@ create_worker_threads(uint n)
thd)) {
msg("compress: pthread_create() failed: "
"errno = %d", errno);
+ pthread_mutex_unlock(&thd->ctrl_mutex);
goto err;
}
}
@@ -386,6 +387,13 @@ create_worker_threads(uint n)
return threads;
err:
+ while (i > 0) {
+ comp_thread_ctxt_t *thd;
+ i--;
+ thd = threads + i;
+ pthread_mutex_unlock(&thd->ctrl_mutex);
+ }
+
my_free(threads);
return NULL;
}