Commit 8b0a798c authored by joreland@mysql.com's avatar joreland@mysql.com

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

into  mysql.com:/home/jonas/src/mysql-5.0-push
parents 121d087d 5faa698e
...@@ -3094,6 +3094,7 @@ Dbdict::execALTER_TABLE_REQ(Signal* signal) ...@@ -3094,6 +3094,7 @@ Dbdict::execALTER_TABLE_REQ(Signal* signal)
alterTabPtr.p->m_coordinatorRef = reference(); alterTabPtr.p->m_coordinatorRef = reference();
alterTabPtr.p->m_fragmentsPtrI = RNIL; alterTabPtr.p->m_fragmentsPtrI = RNIL;
alterTabPtr.p->m_dihAddFragPtr = RNIL; alterTabPtr.p->m_dihAddFragPtr = RNIL;
alterTabPtr.p->m_alterTableId = tablePtr.p->tableId;
// Send prepare request to all alive nodes // Send prepare request to all alive nodes
SimplePropertiesSectionWriter w(getSectionSegmentPool()); SimplePropertiesSectionWriter w(getSectionSegmentPool());
...@@ -3127,7 +3128,7 @@ Dbdict::alterTable_backup_mutex_locked(Signal* signal, ...@@ -3127,7 +3128,7 @@ Dbdict::alterTable_backup_mutex_locked(Signal* signal,
ndbrequire(c_opCreateTable.find(alterTabPtr, callbackData)); ndbrequire(c_opCreateTable.find(alterTabPtr, callbackData));
TableRecordPtr tablePtr; 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 mutex(signal, c_mutexMgr, alterTabPtr.p->m_startLcpMutex);
mutex.unlock(); // ignore response mutex.unlock(); // ignore response
...@@ -3145,6 +3146,10 @@ Dbdict::alterTable_backup_mutex_locked(Signal* signal, ...@@ -3145,6 +3146,10 @@ Dbdict::alterTable_backup_mutex_locked(Signal* signal,
req->senderData = alterTabPtr.p->m_senderData; req->senderData = alterTabPtr.p->m_senderData;
req->senderRef = alterTabPtr.p->m_senderRef; req->senderRef = alterTabPtr.p->m_senderRef;
alterTableRef(signal, req, AlterTableRef::BackupInProgress); alterTableRef(signal, req, AlterTableRef::BackupInProgress);
c_tableRecordPool.getPtr(tablePtr, alterTabPtr.p->m_tablePtrI);
releaseTableObject(tablePtr.i, false);
c_opCreateTable.release(alterTabPtr); c_opCreateTable.release(alterTabPtr);
c_blockState = BS_IDLE; c_blockState = BS_IDLE;
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