1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added missing write_unlock() in case of errors

Browse Source
This commit is contained in:
Michael Widenius 2018-05-09 06:39:38 +03:00
parent 15419a5583
commit d853042b5f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_sequence.cc
View File

@ -459,7 +459,10 @@ int SEQUENCE::read_initial_values(TABLE *table)
mdl_requests.push_front(&mdl_request); mdl_requests.push_front(&mdl_request);
if (thd->mdl_context.acquire_locks(&mdl_requests, if (thd->mdl_context.acquire_locks(&mdl_requests,
thd->variables.lock_wait_timeout)) thd->variables.lock_wait_timeout))
{
write_unlock(table);
DBUG_RETURN(HA_ERR_LOCK_WAIT_TIMEOUT); DBUG_RETURN(HA_ERR_LOCK_WAIT_TIMEOUT);
}
} }
save_lock_type= table->reginfo.lock_type; save_lock_type= table->reginfo.lock_type;
table->reginfo.lock_type= TL_READ; table->reginfo.lock_type= TL_READ;
@ -468,6 +471,7 @@ int SEQUENCE::read_initial_values(TABLE *table)
{ {
if (mdl_lock_used) if (mdl_lock_used)
thd->mdl_context.release_lock(mdl_request.ticket); thd->mdl_context.release_lock(mdl_request.ticket);
write_unlock(table);
DBUG_RETURN(HA_ERR_LOCK_WAIT_TIMEOUT); DBUG_RETURN(HA_ERR_LOCK_WAIT_TIMEOUT);
} }
DBUG_ASSERT(table->reginfo.lock_type == TL_READ); DBUG_ASSERT(table->reginfo.lock_type == TL_READ);