summaryrefslogtreecommitdiff
path: root/sql/mdl.cc
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@dator8>2011-03-04 13:12:31 +0100
committerMikael Ronstrom <mikael@dator8>2011-03-04 13:12:31 +0100
commitb14adc3921d3f2e30f858a31ae73ecdc65901e54 (patch)
treea7f5ebaca17d2031a07efaa3418357b9b756de46 /sql/mdl.cc
parent5f24be65270c844ba705de9121a95b3bb048dcc3 (diff)
downloadmariadb-git-b14adc3921d3f2e30f858a31ae73ecdc65901e54.tar.gz
More review fixes
Diffstat (limited to 'sql/mdl.cc')
-rw-r--r--sql/mdl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc
index 6cab1238b43..21410db2d22 100644
--- a/sql/mdl.cc
+++ b/sql/mdl.cc
@@ -975,14 +975,14 @@ MDL_wait::timed_wait(THD *thd, struct timespec *abs_timeout,
old_msg= thd_enter_cond(thd, &m_COND_wait_status, &m_LOCK_wait_status,
wait_state_name);
+ thd_wait_begin(thd, THD_WAIT_META_DATA_LOCK);
while (!m_wait_status && !thd_killed(thd) &&
wait_result != ETIMEDOUT && wait_result != ETIME)
{
- thd_wait_begin(thd, THD_WAIT_META_DATA_LOCK);
wait_result= mysql_cond_timedwait(&m_COND_wait_status, &m_LOCK_wait_status,
abs_timeout);
- thd_wait_end(thd);
}
+ thd_wait_end(thd);
if (m_wait_status == EMPTY)
{