mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:
unknown 2006-02-02 13:56:14 +01:00
commit 233fe3ee6d
4 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7123,7 +7123,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
return; return;
} }
sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy, __LINE__); sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy);
return; return;
} }
@ -7144,7 +7144,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, __LINE__); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNameTooLong);
return; return;
} }
@ -7156,7 +7156,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, __LINE__); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
return; return;
} }
releaseSections(signal); releaseSections(signal);
@ -7178,14 +7178,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, __LINE__); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
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, __LINE__); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
return; return;
}//if }//if
@ -7199,7 +7199,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
tabPtr.p->tabState != TableRecord::BACKUP_ONGOING) tabPtr.p->tabState != TableRecord::BACKUP_ONGOING)
{ {
jam(); jam();
sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__); sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
return; return;
} }
} }
@ -7290,8 +7290,7 @@ 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];
@ -7300,9 +7299,8 @@ 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, sendSignal(retRef, GSN_GET_TABINFOREF, signal, signal->length(), JBB);
GetTabInfoRef::SignalLength+1, JBB);
}//sendGET_TABINFOREF() }//sendGET_TABINFOREF()
void void

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

@ -2135,8 +2135,7 @@ 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,

5
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file

@ -9992,7 +9992,7 @@ void Dbdih::execLCP_FRAG_REP(Signal* signal)
jamEntry(); jamEntry();
ndbrequire(c_lcpState.lcpStatus != LCP_STATUS_IDLE); ndbrequire(c_lcpState.lcpStatus != LCP_STATUS_IDLE);
#if 1 #if 0
printLCP_FRAG_REP(stdout, printLCP_FRAG_REP(stdout,
signal->getDataPtr(), signal->getDataPtr(),
signal->length(), number()); signal->length(), number());
@ -12789,9 +12789,6 @@ void Dbdih::sendStartFragreq(Signal* signal,
sendSignal(ref, GSN_START_FRAGREQ, signal, sendSignal(ref, GSN_START_FRAGREQ, signal,
StartFragReq::SignalLength, JBB); StartFragReq::SignalLength, JBB);
printSTART_FRAG_REQ(stdout, signal->theData,
StartFragReq::SignalLength, DBLQH);
}//for }//for
}//Dbdih::sendStartFragreq() }//Dbdih::sendStartFragreq()

14
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file

@ -930,9 +930,6 @@ void Dblqh::execLQHFRAGREQ(Signal* signal)
jamEntry(); jamEntry();
LqhFragReq * req = (LqhFragReq*)signal->getDataPtr(); LqhFragReq * req = (LqhFragReq*)signal->getDataPtr();
printLQH_FRAG_REQ(stdout, signal->getDataPtr(),
signal->getLength(), number());
Uint32 retPtr = req->senderData; Uint32 retPtr = req->senderData;
BlockReference retRef = req->senderRef; BlockReference retRef = req->senderRef;
Uint32 fragId = req->fragmentId; Uint32 fragId = req->fragmentId;
@ -10889,7 +10886,6 @@ void Dblqh::execLCP_FRAG_ORD(Signal* signal)
LcpRecord::FragOrd fragOrd; LcpRecord::FragOrd fragOrd;
fragOrd.fragPtrI = fragptr.i; fragOrd.fragPtrI = fragptr.i;
fragOrd.lcpFragOrd = * lcpFragOrd; fragOrd.lcpFragOrd = * lcpFragOrd;
ndbout_c("tabptr.p->tableStatus == Tablerec::PREP_DROP_TABLE_DONE -> sendLCP_FRAG_REP");
sendLCP_FRAG_REP(signal, fragOrd); sendLCP_FRAG_REP(signal, fragOrd);
return; return;
} }
@ -10913,7 +10909,7 @@ void Dblqh::execLCP_PREPARE_REF(Signal* signal)
jamEntry(); jamEntry();
LcpPrepareRef* ref= (LcpPrepareRef*)signal->getDataPtr(); LcpPrepareRef* ref= (LcpPrepareRef*)signal->getDataPtr();
lcpPtr.i = ref->senderData; lcpPtr.i = ref->senderData;
ptrCheckGuard(lcpPtr, clcpFileSize, lcpRecord); ptrCheckGuard(lcpPtr, clcpFileSize, lcpRecord);
ndbrequire(lcpPtr.p->lcpState == LcpRecord::LCP_WAIT_FRAGID); ndbrequire(lcpPtr.p->lcpState == LcpRecord::LCP_WAIT_FRAGID);
@ -10929,10 +10925,6 @@ void Dblqh::execLCP_PREPARE_REF(Signal* signal)
lcpPtr.p->lcpState = LcpRecord::LCP_COMPLETED; lcpPtr.p->lcpState = LcpRecord::LCP_COMPLETED;
lcpPtr.p->m_acc.lcpLocstate = LcpLocRecord::ACC_COMPLETED; lcpPtr.p->m_acc.lcpLocstate = LcpLocRecord::ACC_COMPLETED;
ndbout_c("execLCP_PREPARE_REF tab: %d frag: %d err: %d",
fragptr.p->tabRef, fragptr.p->fragId, ref->errorCode);
contChkpNextFragLab(signal); contChkpNextFragLab(signal);
} }
@ -11147,10 +11139,6 @@ void Dblqh::sendLCP_FRAGIDREQ(Signal* signal)
/** /**
* Fake that the fragment is done * Fake that the fragment is done
*/ */
ndbout_c("tableStatus->contChkpNextFragLab tab: %d frag: %d",
lcpPtr.p->currentFragment.lcpFragOrd.tableId,
lcpPtr.p->currentFragment.lcpFragOrd.fragmentId);
contChkpNextFragLab(signal); contChkpNextFragLab(signal);
return; return;
} }