diff options
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 85fe6896189..14a1f17fe86 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -2143,20 +2143,21 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout) if (wait_status != MDL_wait::EMPTY) break; /* Check if the client is gone while we were waiting. */ - if (! thd_is_connected(thd) + if (! thd_is_connected(thd)) + { #if defined(WITH_WSREP) && !defined(EMBEDDED_LIBRARY) - // During SST client might not be connected - && WSREP(thd) && !wsrep_is_sst_progress() + // During SST client might not be connected + if (!wsrep_is_sst_progress()) #endif - ) - { - /* - * The client is disconnected. Don't wait forever: - * assume it's the same as a wait timeout, this - * ensures all error handling is correct. - */ - wait_status= MDL_wait::TIMEOUT; - break; + { + /* + * The client is disconnected. Don't wait forever: + * assume it's the same as a wait timeout, this + * ensures all error handling is correct. + */ + wait_status= MDL_wait::TIMEOUT; + break; + } } mysql_prlock_wrlock(&lock->m_rwlock); |