diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-07 12:43:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-07 12:43:10 +0400 |
| commit | 8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39 (patch) | |
| tree | 72fa33f92344a89792845bab9225cef56b4138c4 /extra/mariabackup/xbstream.c | |
| parent | 3f327432942ef5db14dd905ffd147f234dc74bfb (diff) | |
| parent | 3b862aaa10942e7405b90cf80d0c3baca4cda55d (diff) | |
| download | mariadb-git-8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'extra/mariabackup/xbstream.c')
| -rw-r--r-- | extra/mariabackup/xbstream.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extra/mariabackup/xbstream.c b/extra/mariabackup/xbstream.c index edfe20a9e3c..f3880f9ec03 100644 --- a/extra/mariabackup/xbstream.c +++ b/extra/mariabackup/xbstream.c @@ -444,7 +444,11 @@ extract_worker_thread_func(void *arg) } if (chunk.type == XB_CHUNK_TYPE_EOF) { + pthread_mutex_lock(ctxt->mutex); pthread_mutex_unlock(&entry->mutex); + my_hash_delete(ctxt->filehash, (uchar *) entry); + pthread_mutex_unlock(ctxt->mutex); + continue; } |