Commit eb9f8480 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into  mysql.com:/home/jonas/src/mysql-5.1-push


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
parents 17c2e61a c556acbf

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+6 −1
Original line number Diff line number Diff line
@@ -3123,6 +3123,7 @@ Dbdict::execALTER_TABLE_REQ(Signal* signal) 
  alterTabPtr.p->m_coordinatorRef = reference();

  alterTabPtr.p->m_fragmentsPtrI = RNIL;

  alterTabPtr.p->m_dihAddFragPtr = RNIL;

  alterTabPtr.p->m_alterTableId = tablePtr.p->tableId;



  // Send prepare request to all alive nodes

  SimplePropertiesSectionWriter w(getSectionSegmentPool());
@@ -3156,7 +3157,7 @@ Dbdict::alterTable_backup_mutex_locked(Signal* signal, 
  ndbrequire(c_opCreateTable.find(alterTabPtr, callbackData));



  TableRecordPtr tablePtr;

  c_tableRecordPool.getPtr(tablePtr, alterTabPtr.p->m_tablePtrI, true);

  c_tableRecordPool.getPtr(tablePtr, alterTabPtr.p->m_alterTableId, true);



  Mutex mutex(signal, c_mutexMgr, alterTabPtr.p->m_startLcpMutex);

  mutex.unlock(); // ignore response
@@ -3174,6 +3175,10 @@ Dbdict::alterTable_backup_mutex_locked(Signal* signal, 
    req->senderData = alterTabPtr.p->m_senderData;

    req->senderRef = alterTabPtr.p->m_senderRef;

    alterTableRef(signal, req, AlterTableRef::BackupInProgress);



    c_tableRecordPool.getPtr(tablePtr, alterTabPtr.p->m_tablePtrI);  

    releaseTableObject(tablePtr.i, false);



    c_opCreateTable.release(alterTabPtr);

    c_blockState = BS_IDLE;

    return;