diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-23 13:01:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-23 13:06:22 +0100 |
| commit | f33e57a9e66f7e1790cb84b141381bb668e281a0 (patch) | |
| tree | 31bb1c5bd8e0addc9e994a1bb42b4703c37f7ed8 /sql/log.cc | |
| parent | 1a0526e2f294acdcac829672794ee1fe708eb2b3 (diff) | |
| parent | 245d33db4e0586df4fe28362fb002cef0151a1c9 (diff) | |
| download | mariadb-git-f33e57a9e66f7e1790cb84b141381bb668e281a0.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index d6b47ff3aa6..3b1322035eb 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -6591,8 +6591,9 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) MDL_REQUEST_INIT(&mdl_request, MDL_key::BACKUP, "", "", MDL_BACKUP_COMMIT, MDL_EXPLICIT); - thd->mdl_context.acquire_lock(&mdl_request, - thd->variables.lock_wait_timeout); + if (thd->mdl_context.acquire_lock(&mdl_request, + thd->variables.lock_wait_timeout)) + DBUG_RETURN(1); thd->backup_commit_lock= &mdl_request; if ((res= thd->wait_for_prior_commit())) |