Commit ee735892 authored by unknown's avatar unknown

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
parents 2f90ab13 3acd8d31
...@@ -5200,9 +5200,9 @@ void Dbacc::execEXPANDCHECK2(Signal* signal) ...@@ -5200,9 +5200,9 @@ void Dbacc::execEXPANDCHECK2(Signal* signal)
{ {
jamEntry(); jamEntry();
if(refToBlock(signal->getSendersBlockRef()) == DBLQH){ if(refToBlock(signal->getSendersBlockRef()) == DBLQH)
{
jam(); jam();
reenable_expand_after_redo_log_exection_complete(signal);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment