diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:39:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:39:34 +0200 |
| commit | 51c89849d16f3f6cfadfa645c49815db3cbfece7 (patch) | |
| tree | 8679103f7897480cc9b5ff3308687cce1f32dade /extra | |
| parent | bf8735eb16068c0d2480948b365f7e39dc011be5 (diff) | |
| parent | d4cb1776030b643895da0532b75c051f55e84356 (diff) | |
| download | mariadb-git-51c89849d16f3f6cfadfa645c49815db3cbfece7.tar.gz | |
Merge 10.5 into 10.6
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 5776a7ddab3..a7a35c58ac3 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 3fe9d17d86e..6306806b867 100644 --- a/extra/mariabackup/xbstream.cc +++ b/extra/mariabackup/xbstream.cc @@ -440,8 +440,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); |