Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2102 06/02/02 07:21:23 jonas@stripped +4 -0
bug#10987 - ndb - remove extra printouts, used to track volatile bug
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
1.89 06/02/02 07:21:20 jonas@stripped +1 -13
remove extra printouts
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
1.50 06/02/02 07:21:20 jonas@stripped +1 -4
remove extra printouts
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
1.28 06/02/02 07:21:20 jonas@stripped +1 -2
remove extra printouts
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
1.74 06/02/02 07:21:20 jonas@stripped +9 -11
remove extra printouts
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jonas
# Host: perch.ndb.mysql.com
# Root: /home/jonas/src/mysql-5.1-new
--- 1.73/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2006-01-30 21:06:57 +01:00
+++ 1.74/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2006-02-02 07:21:20 +01:00
@@ -7114,7 +7114,7 @@
return;
}
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy, __LINE__);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy);
return;
}
@@ -7135,7 +7135,7 @@
if(len > MAX_TAB_NAME_SIZE){
jam();
releaseSections(signal);
- sendGET_TABINFOREF(signal,req,GetTabInfoRef::TableNameTooLong, __LINE__);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNameTooLong);
return;
}
@@ -7147,7 +7147,7 @@
if(!r0.getWords((Uint32*)tableName, (len+3)/4)){
jam();
releaseSections(signal);
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
return;
}
releaseSections(signal);
@@ -7169,14 +7169,14 @@
// The table seached for was not found
if(objEntry == 0){
jam();
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
return;
}//if
if (objEntry->m_tableState != SchemaFile::TABLE_ADD_COMMITTED &&
objEntry->m_tableState != SchemaFile::ALTER_TABLE_COMMITTED){
jam();
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
return;
}//if
@@ -7190,7 +7190,7 @@
tabPtr.p->tabState != TableRecord::BACKUP_ONGOING)
{
jam();
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
return;
}
}
@@ -7281,8 +7281,7 @@
void Dbdict::sendGET_TABINFOREF(Signal* signal,
GetTabInfoReq * req,
- GetTabInfoRef::ErrorCode errorCode,
- Uint32 line)
+ GetTabInfoRef::ErrorCode errorCode)
{
jamEntry();
GetTabInfoRef * const ref = (GetTabInfoRef *)&signal->theData[0];
@@ -7291,9 +7290,8 @@
*/
BlockReference retRef = req->senderRef;
ref->errorCode = errorCode;
- signal->theData[GetTabInfoRef::SignalLength] = line;
- sendSignal(retRef, GSN_GET_TABINFOREF, signal,
- GetTabInfoRef::SignalLength+1, JBB);
+
+ sendSignal(retRef, GSN_GET_TABINFOREF, signal, signal->length(), JBB);
}//sendGET_TABINFOREF()
void
--- 1.27/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2006-01-30 08:23:52 +01:00
+++ 1.28/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2006-02-02 07:21:20 +01:00
@@ -2135,8 +2135,7 @@
/* ------------------------------------------------------------ */
void sendGET_TABINFOREF(Signal* signal,
GetTabInfoReq*,
- GetTabInfoRef::ErrorCode errorCode,
- Uint32 line);
+ GetTabInfoRef::ErrorCode errorCode);
void sendGET_TABLEID_REF(Signal* signal,
GetTableIdReq * req,
--- 1.49/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2006-01-29 15:53:30 +01:00
+++ 1.50/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2006-02-02 07:21:20 +01:00
@@ -9992,7 +9992,7 @@
jamEntry();
ndbrequire(c_lcpState.lcpStatus != LCP_STATUS_IDLE);
-#if 1
+#if 0
printLCP_FRAG_REP(stdout,
signal->getDataPtr(),
signal->length(), number());
@@ -12789,9 +12789,6 @@
sendSignal(ref, GSN_START_FRAGREQ, signal,
StartFragReq::SignalLength, JBB);
-
- printSTART_FRAG_REQ(stdout, signal->theData,
- StartFragReq::SignalLength, DBLQH);
}//for
}//Dbdih::sendStartFragreq()
--- 1.88/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2006-01-29 23:13:36 +01:00
+++ 1.89/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2006-02-02 07:21:20 +01:00
@@ -930,9 +930,6 @@
jamEntry();
LqhFragReq * req = (LqhFragReq*)signal->getDataPtr();
- printLQH_FRAG_REQ(stdout, signal->getDataPtr(),
- signal->getLength(), number());
-
Uint32 retPtr = req->senderData;
BlockReference retRef = req->senderRef;
Uint32 fragId = req->fragmentId;
@@ -10889,7 +10886,6 @@
LcpRecord::FragOrd fragOrd;
fragOrd.fragPtrI = fragptr.i;
fragOrd.lcpFragOrd = * lcpFragOrd;
- ndbout_c("tabptr.p->tableStatus == Tablerec::PREP_DROP_TABLE_DONE -> sendLCP_FRAG_REP");
sendLCP_FRAG_REP(signal, fragOrd);
return;
}
@@ -10913,7 +10909,7 @@
jamEntry();
LcpPrepareRef* ref= (LcpPrepareRef*)signal->getDataPtr();
-
+
lcpPtr.i = ref->senderData;
ptrCheckGuard(lcpPtr, clcpFileSize, lcpRecord);
ndbrequire(lcpPtr.p->lcpState == LcpRecord::LCP_WAIT_FRAGID);
@@ -10929,10 +10925,6 @@
lcpPtr.p->lcpState = LcpRecord::LCP_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);
}
@@ -11147,10 +11139,6 @@
/**
* 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);
return;
}
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2102) BUG#10987 | jonas | 2 Feb |
