diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 10:33:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 10:33:06 +0200 |
| commit | 289721de9aca8cdf3bdef1a010477e2d38eebb8d (patch) | |
| tree | 50a9f9ea56a7a0b68210e1061ced47951298d2d9 /extra | |
| parent | 9962cda52722b77c2a7e0314bbaa2e4f963f55c1 (diff) | |
| parent | f5441ef4dac9f3fd5dfe1bfa25a514715fee649f (diff) | |
| download | mariadb-git-289721de9aca8cdf3bdef1a010477e2d38eebb8d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | extra/mariabackup/xbstream.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt index f84bb1aabd2..aad30ba9b11 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 diff --git a/extra/mariabackup/xbstream.cc b/extra/mariabackup/xbstream.cc index 1655b69235c..e84d703c5ff 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); |