mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 09:15:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-01-30 08:24:24 +01:00
commit 0f9efc3063
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
storage/ndb/src/kernel/blocks/backup/Backup.cpp
View file

@ -2756,6 +2756,11 @@ Backup::execGET_TABINFOREF(Signal* signal)
BackupRecordPtr ptr; BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, senderData); c_backupPool.getPtr(ptr, senderData);
ndbout_c("execGET_TABINFOREF: tab: %d errorCode: %d extra: %d",
ref->tableId,
ref->errorCode,
signal->theData[signal->getLength()-1]);
defineBackupRef(signal, ptr, ref->errorCode); defineBackupRef(signal, ptr, ref->errorCode);
} }

20
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file

@ -7114,7 +7114,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
return; return;
} }
sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy); sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy, __LINE__);
return; return;
} }
@ -7135,7 +7135,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
if(len > MAX_TAB_NAME_SIZE){ if(len > MAX_TAB_NAME_SIZE){
jam(); jam();
releaseSections(signal); releaseSections(signal);
sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNameTooLong); sendGET_TABINFOREF(signal,req,GetTabInfoRef::TableNameTooLong, __LINE__);
return; return;
} }
@ -7147,7 +7147,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
if(!r0.getWords((Uint32*)tableName, (len+3)/4)){ if(!r0.getWords((Uint32*)tableName, (len+3)/4)){
jam(); jam();
releaseSections(signal); releaseSections(signal);
sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
return; return;
} }
releaseSections(signal); releaseSections(signal);
@ -7169,14 +7169,14 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
// The table seached for was not found // The table seached for was not found
if(objEntry == 0){ if(objEntry == 0){
jam(); jam();
sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
return; return;
}//if }//if
if (objEntry->m_tableState != SchemaFile::TABLE_ADD_COMMITTED && if (objEntry->m_tableState != SchemaFile::TABLE_ADD_COMMITTED &&
objEntry->m_tableState != SchemaFile::ALTER_TABLE_COMMITTED){ objEntry->m_tableState != SchemaFile::ALTER_TABLE_COMMITTED){
jam(); jam();
sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
return; return;
}//if }//if
@ -7189,7 +7189,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
if (tabPtr.p->tabState != TableRecord::DEFINED) if (tabPtr.p->tabState != TableRecord::DEFINED)
{ {
jam(); jam();
sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
return; return;
} }
} }
@ -7280,7 +7280,8 @@ void Dbdict::sendGetTabResponse(Signal* signal)
void Dbdict::sendGET_TABINFOREF(Signal* signal, void Dbdict::sendGET_TABINFOREF(Signal* signal,
GetTabInfoReq * req, GetTabInfoReq * req,
GetTabInfoRef::ErrorCode errorCode) GetTabInfoRef::ErrorCode errorCode,
Uint32 line)
{ {
jamEntry(); jamEntry();
GetTabInfoRef * const ref = (GetTabInfoRef *)&signal->theData[0]; GetTabInfoRef * const ref = (GetTabInfoRef *)&signal->theData[0];
@ -7289,8 +7290,9 @@ void Dbdict::sendGET_TABINFOREF(Signal* signal,
*/ */
BlockReference retRef = req->senderRef; BlockReference retRef = req->senderRef;
ref->errorCode = errorCode; ref->errorCode = errorCode;
signal->theData[GetTabInfoRef::SignalLength] = line;
sendSignal(retRef, GSN_GET_TABINFOREF, signal, signal->length(), JBB); sendSignal(retRef, GSN_GET_TABINFOREF, signal,
GetTabInfoRef::SignalLength+1, JBB);
}//sendGET_TABINFOREF() }//sendGET_TABINFOREF()
void void

3
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
View file

@ -2135,7 +2135,8 @@ private:
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
void sendGET_TABINFOREF(Signal* signal, void sendGET_TABINFOREF(Signal* signal,
GetTabInfoReq*, GetTabInfoReq*,
GetTabInfoRef::ErrorCode errorCode); GetTabInfoRef::ErrorCode errorCode,
Uint32 line);
void sendGET_TABLEID_REF(Signal* signal, void sendGET_TABLEID_REF(Signal* signal,
GetTableIdReq * req, GetTableIdReq * req,