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

Merge perch.ndb.mysql.com:/home/jonas/src/50-work

Browse Source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-12-01 14:05:41 +01:00
commit d19c93e900
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View File

@ -10184,6 +10184,15 @@ Dbdict::checkDictLockQueue(Signal* signal, bool poll)
break; break;
} }
if (c_blockState != BS_IDLE)
{
/**
* If state is BS_NODE_FAILURE, it might be that no op is running
*/
jam();
break;
}
ndbrequire(c_blockState == BS_IDLE); ndbrequire(c_blockState == BS_IDLE);
lockPtr.p->locked = true; lockPtr.p->locked = true;
c_blockState = lockPtr.p->lt->blockState; c_blockState = lockPtr.p->lt->blockState;