diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2020-01-28 19:12:43 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2020-01-28 19:12:43 +0300 |
| commit | 482b96fad3cd936664c839aec7fd4556555d8dda (patch) | |
| tree | c1fe23806612f4c66892f3f57648656ee652cd8d | |
| parent | 06203f22e4cc432c30b2b0724d9537d19314094c (diff) | |
| download | mariadb-git-10.2-enterprise-rebase-mariabackup-fix.tar.gz | |
exit() function invokes exit handlers, one of which invokes10.2-enterprise-rebase-mariabackup-fix
CreateTracker::~CreateTracker(), which, in turns, aborts execution
if there are non-destroyed mutexes. At the other hand, die() invokes
_exit(), what allows to avoid exit handlers execution.
Must be squashed with MENT-9 commit.
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index d88833d37ff..ff169b18bfc 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -4211,10 +4211,8 @@ private: // too, use separate mysql connection per thread here DBUG_MARIABACKUP_EVENT("before_copy", node->space->name); /* copy the datafile */ - if(xtrabackup_copy_datafile(node, thread_num)) { - msg(thread_num, "mariabackup: Error: failed to copy datafile."); - exit(EXIT_FAILURE); - } + if(xtrabackup_copy_datafile(node, thread_num)) + die("mariabackup: Error: failed to copy datafile."); // TODO: this came from the old code, where it was not thread-safe // too, use separate mysql connection per thread here DBUG_MARIABACKUP_EVENT("after_copy", node->space->name); |