summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--storage/ndb/src/kernel/blocks/backup/Backup.cpp5
-rw-r--r--storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp20
-rw-r--r--storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp3
3 files changed, 18 insertions, 10 deletions
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
index 49d814e612e..836f8b4bb8b 100644
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
@@ -2756,6 +2756,11 @@ Backup::execGET_TABINFOREF(Signal* signal)
BackupRecordPtr ptr;
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);
}
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index 1d8a5203a85..e5b29785ea6 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -7114,7 +7114,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
return;
}
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy, __LINE__);
return;
}
@@ -7135,7 +7135,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
if(len > MAX_TAB_NAME_SIZE){
jam();
releaseSections(signal);
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNameTooLong);
+ sendGET_TABINFOREF(signal,req,GetTabInfoRef::TableNameTooLong, __LINE__);
return;
}
@@ -7147,7 +7147,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
if(!r0.getWords((Uint32*)tableName, (len+3)/4)){
jam();
releaseSections(signal);
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
return;
}
releaseSections(signal);
@@ -7169,14 +7169,14 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
// The table seached for was not found
if(objEntry == 0){
jam();
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
return;
}//if
if (objEntry->m_tableState != SchemaFile::TABLE_ADD_COMMITTED &&
objEntry->m_tableState != SchemaFile::ALTER_TABLE_COMMITTED){
jam();
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
return;
}//if
@@ -7189,7 +7189,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
if (tabPtr.p->tabState != TableRecord::DEFINED)
{
jam();
- sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
+ sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
return;
}
}
@@ -7280,7 +7280,8 @@ void Dbdict::sendGetTabResponse(Signal* signal)
void Dbdict::sendGET_TABINFOREF(Signal* signal,
GetTabInfoReq * req,
- GetTabInfoRef::ErrorCode errorCode)
+ GetTabInfoRef::ErrorCode errorCode,
+ Uint32 line)
{
jamEntry();
GetTabInfoRef * const ref = (GetTabInfoRef *)&signal->theData[0];
@@ -7289,8 +7290,9 @@ void Dbdict::sendGET_TABINFOREF(Signal* signal,
*/
BlockReference retRef = req->senderRef;
ref->errorCode = errorCode;
-
- sendSignal(retRef, GSN_GET_TABINFOREF, signal, signal->length(), JBB);
+ signal->theData[GetTabInfoRef::SignalLength] = line;
+ sendSignal(retRef, GSN_GET_TABINFOREF, signal,
+ GetTabInfoRef::SignalLength+1, JBB);
}//sendGET_TABINFOREF()
void
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
index 293632bb8b8..08ddf819a09 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
@@ -2135,7 +2135,8 @@ private:
/* ------------------------------------------------------------ */
void sendGET_TABINFOREF(Signal* signal,
GetTabInfoReq*,
- GetTabInfoRef::ErrorCode errorCode);
+ GetTabInfoRef::ErrorCode errorCode,
+ Uint32 line);
void sendGET_TABLEID_REF(Signal* signal,
GetTableIdReq * req,