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

A follow up for the previous patch, titled:

Browse Source 
A code review comment for Bug#52289.
Encapsulate the deadlock detection functionality into
a visitor class...

Remove a race introduced by omission: 
initialize iterators under a read lock on the object.

sql/mdl.cc:
  Initialize iterators under a read lock on the object.
This commit is contained in:
Konstantin Osipov 2010-06-03 18:32:56 +04:00
parent e7854c86a7
commit cbf4019a1b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mdl.cc
View File

@ -1854,15 +1854,16 @@ bool MDL_lock::find_deadlock(MDL_ticket *waiting_ticket,
MDL_ticket *ticket; MDL_ticket *ticket;
MDL_context *src_ctx= waiting_ticket->get_ctx(); MDL_context *src_ctx= waiting_ticket->get_ctx();
bool result= TRUE; bool result= TRUE;
Ticket_iterator granted_it(m_granted);
Ticket_iterator waiting_it(m_waiting);
if (dvisitor->enter_node(src_ctx)) if (dvisitor->enter_node(src_ctx))
return TRUE; return TRUE;
mysql_prlock_rdlock(&m_rwlock); mysql_prlock_rdlock(&m_rwlock);
/* Must be initialized after taking a read lock. */
Ticket_iterator granted_it(m_granted);
Ticket_iterator waiting_it(m_waiting);
/* /*
We do a breadth-first search first -- that is, inspect all We do a breadth-first search first -- that is, inspect all
edges of the current node, and only then follow up to the next edges of the current node, and only then follow up to the next