Skip to content

Removed a "goto" statement in table lock routine. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danesh-d wants to merge 1 commit into
base: 10.2
Choose a base branch
from
Open

Removed a "goto" statement in table lock routine. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions sql/lock.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,25 +306,24 @@ bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags)

thd->backup_stage(&org_stage);
THD_STAGE_INFO(thd, stage_system_lock);
if (sql_lock->table_count && lock_external(thd, sql_lock->table,
sql_lock->table_count))
goto end;

THD_STAGE_INFO(thd, stage_table_lock);

/* Copy the lock data array. thr_multi_lock() reorders its contents. */
memmove(sql_lock->locks + sql_lock->lock_count, sql_lock->locks,
sql_lock->lock_count * sizeof(*sql_lock->locks));

/* Lock on the copied half of the lock data array. */
rc= thr_lock_errno_to_mysql[(int) thr_multi_lock(sql_lock->locks +
sql_lock->lock_count,
sql_lock->lock_count,
&thd->lock_info, timeout)];
if (rc && sql_lock->table_count)
(void) unlock_external(thd, sql_lock->table, sql_lock->table_count);
if (!(sql_lock->table_count && lock_external(thd, sql_lock->table,
sql_lock->table_count)))
{
THD_STAGE_INFO(thd, stage_table_lock);

/* Copy the lock data array. thr_multi_lock() reorders its contents. */
memmove(sql_lock->locks + sql_lock->lock_count, sql_lock->locks,
sql_lock->lock_count * sizeof(*sql_lock->locks));

/* Lock on the copied half of the lock data array. */
rc= thr_lock_errno_to_mysql[(int) thr_multi_lock(sql_lock->locks +
sql_lock->lock_count,
sql_lock->lock_count,
&thd->lock_info, timeout)];
if (rc && sql_lock->table_count)
(void) unlock_external(thd, sql_lock->table, sql_lock->table_count);
}

end:
THD_STAGE_INFO(thd, org_stage);

if (thd->killed)
Expand Down